1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 1bc4cdc797db..dc05a57a474a 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -57,8 +57,8 @@ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_PCI)               += early-quirks.o
 apm-y                           := apm_32.o
 obj-$(CONFIG_APM)               += apm.o
-obj-$(CONFIG_X86_SMP)           += smp.o
+obj-$(CONFIG_SMP)               += smp.o
-obj-$(CONFIG_X86_SMP)           += smpboot.o tsc_sync.o ipi.o
+obj-$(CONFIG_SMP)               += smpboot.o tsc_sync.o ipi.o
 obj-$(CONFIG_SMP)               += setup_percpu.o
 obj-$(CONFIG_X86_64_SMP)        += tsc_sync.o
 obj-$(CONFIG_X86_TRAMPOLINE)    += trampoline_$(BITS).o

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 1bc4cdc797db..dc05a57a474a 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile
@@ -57,8 +57,8 @@ obj-$(CONFIG_X86_CPUID) += cpuid.o
57	obj-$(CONFIG_PCI) += early-quirks.o	57	obj-$(CONFIG_PCI) += early-quirks.o
58	apm-y := apm_32.o	58	apm-y := apm_32.o
59	obj-$(CONFIG_APM) += apm.o	59	obj-$(CONFIG_APM) += apm.o
60	obj-$(CONFIG_X86_SMP) += smp.o	60	obj-$(CONFIG_SMP) += smp.o
61	obj-$(CONFIG_X86_SMP) += smpboot.o tsc_sync.o ipi.o	61	obj-$(CONFIG_SMP) += smpboot.o tsc_sync.o ipi.o
62	obj-$(CONFIG_SMP) += setup_percpu.o	62	obj-$(CONFIG_SMP) += setup_percpu.o
63	obj-$(CONFIG_X86_64_SMP) += tsc_sync.o	63	obj-$(CONFIG_X86_64_SMP) += tsc_sync.o
64	obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o	64	obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o