Merge branch 'x86/core' into x86/unify-cpu-detect

[linux-2.6-omap-h63xx.git] / arch / x86 / mach-generic / Makefile

diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 19d6d407737b51dbb76ac08be1f83afab194f6ba..6730f4e7c744693c89b5f47312a2a247e8e6979a 100644 (file)
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -2,7 +2,10 @@
 # Makefile for the generic architecture
 #
 
-EXTRA_CFLAGS   := -Iarch/x86/kernel
+EXTRA_CFLAGS                   := -Iarch/x86/kernel
 
-obj-y          := probe.o summit.o bigsmp.o es7000.o default.o 
-obj-y          += ../../x86/mach-es7000/
+obj-y                          := probe.o default.o
+obj-$(CONFIG_X86_NUMAQ)                += numaq.o
+obj-$(CONFIG_X86_SUMMIT)       += summit.o
+obj-$(CONFIG_X86_BIGSMP)       += bigsmp.o
+obj-$(CONFIG_X86_ES7000)       += es7000.o