Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 19d6d407737b..0dbd7803a1d5 100644
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -2,7 +2,11 @@
 # 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
+obj-$(CONFIG_X86_ES7000)        += ../../x86/mach-es7000/