summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:52 +0200
commita0d557e2c28623c58e645c29f309a823edd7a1bf (patch)
treef8c4eb6a88c8b4dfb7ed97fee2b3eeecc2f68ff6 /arch/i386/kernel
parentbb2c787b41d0cffd372865b474903f7b3cfcdd7e (diff)
i386: prepare shared kernel/apm.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/apm_32.c (renamed from arch/i386/kernel/apm.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 0d329e12a03..ce8dd0ad8a7 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -17,7 +17,7 @@ obj-$(CONFIG_MCA) += mca_32.o
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o
-obj-$(CONFIG_APM) += apm.o
+obj-$(CONFIG_APM) += apm_32.o
obj-$(CONFIG_X86_SMP) += smp_32.o smpboot_32.o tsc_sync.o
obj-$(CONFIG_SMP) += smpcommon_32.o
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm_32.c
index f02a8aca826..f02a8aca826 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm_32.c