summaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-generic/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
commit38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch)
treea83d5e4e86edf6cb2de22db6f2ff2274753a2bab /arch/x86/mach-generic/Makefile
parentf2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
Merge branch 'linus' into core/printk
Diffstat (limited to 'arch/x86/mach-generic/Makefile')
-rw-r--r--arch/x86/mach-generic/Makefile11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
deleted file mode 100644
index 6730f4e7c74..00000000000
--- a/arch/x86/mach-generic/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the generic architecture
-#
-
-EXTRA_CFLAGS := -Iarch/x86/kernel
-
-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