aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/mach-es7000/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-12 07:30:05 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-12 07:30:05 +0200
commit1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch)
tree7211f558d841cb40e1015d0b7527643ad55cb8e7 /arch/x86/mach-es7000/Makefile
parenta26929fb489188ff959b1715ee67f0c9f84405b5 (diff)
parentae94b8075a2ed58d2318ef03827b25bc844f844e (diff)
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'arch/x86/mach-es7000/Makefile')
-rw-r--r--arch/x86/mach-es7000/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mach-es7000/Makefile b/arch/x86/mach-es7000/Makefile
index 69dd4da218d..3ef8b43b62f 100644
--- a/arch/x86/mach-es7000/Makefile
+++ b/arch/x86/mach-es7000/Makefile
@@ -3,4 +3,3 @@
#
obj-$(CONFIG_X86_ES7000) := es7000plat.o
-obj-$(CONFIG_X86_GENERICARCH) := es7000plat.o