diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 223c5e252ec1dc230612e4a7ac261edba32409d4..c462803a4db2f23cce7ea0f907a20ce9cdee1744 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
similarity index 100%
rename from arch/i386/mach-es7000/Makefile
rename to arch/x86/mach-es7000/Makefile
diff --git a/arch/i386/mach-es7000/es7000.h b/arch/x86/mach-es7000/es7000.h
similarity index 100%
rename from arch/i386/mach-es7000/es7000.h
rename to arch/x86/mach-es7000/es7000.h
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/x86/mach-es7000/es7000plat.c
similarity index 100%
rename from arch/i386/mach-es7000/es7000plat.c
rename to arch/x86/mach-es7000/es7000plat.c
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 2f216f55b2ddd259983712ea4925fb201920c746..08f489a7f1f5da6b4c8313758b62ae15457dc6d6 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/