Commit 3a900d89 authored Feb 04, 2008 by Sam Ravnborg Committed by Ingo Molnar Feb 04, 2008

x86: restore correct module name for apm



The apm module were renamed to apm_32 during the merge of 32 and 64 bit
x86 which is unfortunate. As apm is 32 bit specific we like to keep the
_32 in the filename but the module should be named apm.

Fix this in the Makefile.

Reported-by: "A.E.Lawrence" <lawrence_a_e@ntlworld.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "A.E.Lawrence" <lawrence_a_e@ntlworld.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 262d5ee2

arch/x86/kernel/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@ obj-$(CONFIG_X86_MSR) += msr.o
		obj-$(CONFIG_X86_CPUID) += cpuid.o
		obj-$(CONFIG_MICROCODE) += microcode.o
		obj-$(CONFIG_PCI) += early-quirks.o
		obj-$(CONFIG_APM) += apm_32.o
		apm-y := apm_32.o
		obj-$(CONFIG_APM) += apm.o
		obj-$(CONFIG_X86_SMP) += smp_$(BITS).o smpboot_$(BITS).o tsc_sync.o
		obj-$(CONFIG_X86_32_SMP) += smpcommon_32.o
		obj-$(CONFIG_X86_64_SMP) += smp_64.o smpboot_64.o tsc_sync.o

Admin message