summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:50 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:50 +0200
commitbb2c787b41d0cffd372865b474903f7b3cfcdd7e (patch)
tree9f8503ef5130818930db499848a618570d6afc12 /arch/i386/kernel
parenti386: prepare shared kernel/time.c (diff)
downloadlinux-bb2c787b41d0cffd372865b474903f7b3cfcdd7e.tar.xz
linux-bb2c787b41d0cffd372865b474903f7b3cfcdd7e.zip
i386: prepare shared kernel/scx200.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/scx200_32.c (renamed from arch/i386/kernel/scx200.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 31c4541c4e14..0d329e12a039 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
obj-$(CONFIG_PARAVIRT) += paravirt_32.o
obj-y += pcspeaker.o
-obj-$(CONFIG_SCx200) += scx200.o
+obj-$(CONFIG_SCx200) += scx200_32.o
# vsyscall_32.o contains the vsyscall DSO images as __initdata.
# We must build both images before we can assemble it.
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200_32.c
index c7d3df23f589..c7d3df23f589 100644
--- a/arch/i386/kernel/scx200.c
+++ b/arch/i386/kernel/scx200_32.c