aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-es7000/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-07-25 10:40:14 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-25 10:40:14 -0400
commitff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch)
tree85205005c611ab774702148558321c6fb92f1ccd /arch/x86/mach-es7000/Makefile
parent30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff)
parentd37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff)
downloadkernel_samsung_tuna-ff877ea80efa2015b6263766f78ee42c2a1b32f9.zip
kernel_samsung_tuna-ff877ea80efa2015b6263766f78ee42c2a1b32f9.tar.gz
kernel_samsung_tuna-ff877ea80efa2015b6263766f78ee42c2a1b32f9.tar.bz2
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
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 69dd4da..3ef8b43 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