diff --git a/[refs] b/[refs]
index aca5613d513e..e8c581f7d18b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d629e03b64c469245ceb07d05460e1e2eefa7585
+refs/heads/master: 334e621a01f86d5bc25e4f742e1eaae6e2d2a97a
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 223c5e252ec1..c462803a4db2 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/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/trunk/arch/i386/mach-es7000/Makefile b/trunk/arch/x86/mach-es7000/Makefile
similarity index 100%
rename from trunk/arch/i386/mach-es7000/Makefile
rename to trunk/arch/x86/mach-es7000/Makefile
diff --git a/trunk/arch/i386/mach-es7000/es7000.h b/trunk/arch/x86/mach-es7000/es7000.h
similarity index 100%
rename from trunk/arch/i386/mach-es7000/es7000.h
rename to trunk/arch/x86/mach-es7000/es7000.h
diff --git a/trunk/arch/i386/mach-es7000/es7000plat.c b/trunk/arch/x86/mach-es7000/es7000plat.c
similarity index 100%
rename from trunk/arch/i386/mach-es7000/es7000plat.c
rename to trunk/arch/x86/mach-es7000/es7000plat.c
diff --git a/trunk/arch/x86/mach-generic/Makefile b/trunk/arch/x86/mach-generic/Makefile
index 2f216f55b2dd..08f489a7f1f5 100644
--- a/trunk/arch/x86/mach-generic/Makefile
+++ b/trunk/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/