i386: move mach-es7000

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 2 insertions, 2 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 223c5e252ec1..c462803a4db2 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -91,7 +91,7 @@ core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
 # ES7000 subarch support
 mflags-$(CONFIG_X86_ES7000)     := -Iinclude/asm-i386/mach-es7000
 mcore-$(CONFIG_X86_ES7000)      := arch/x86/mach-default
-core-$(CONFIG_X86_ES7000)       := arch/i386/mach-es7000/
+core-$(CONFIG_X86_ES7000)       := arch/x86/mach-es7000/
 
 # Xen paravirtualization support
 core-$(CONFIG_XEN)              += arch/i386/xen/
diff --git a/arch/i386/mach-es7000/Makefile b/arch/x86/mach-es7000/Makefile
index 69dd4da218dc..69dd4da218dc 100644
--- a/arch/i386/mach-es7000/Makefile
+++ b/arch/x86/mach-es7000/Makefile
diff --git a/arch/i386/mach-es7000/es7000.h b/arch/x86/mach-es7000/es7000.h
index c8d5aa132fa0..c8d5aa132fa0 100644
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/x86/mach-es7000/es7000.h
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/x86/mach-es7000/es7000plat.c
index ab99072d3f9a..ab99072d3f9a 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/x86/mach-es7000/es7000plat.c
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 2f216f55b2dd..08f489a7f1f5 100644
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -5,4 +5,4 @@
 EXTRA_CFLAGS    := -Iarch/i386/kernel
 
 obj-y           := probe.o summit.o bigsmp.o es7000.o default.o 
-obj-y           += ../../i386/mach-es7000/
+obj-y           += ../../x86/mach-es7000/