diff --git a/[refs] b/[refs]
index 5b454bebd382..11b9cd3fdc53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24f5b95bb91a6edac5dfdc7ddcbd6cabe0b30430
+refs/heads/master: a584dfcc686c5ed89a234f2166ddaf73ec22f31a
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 84297d470df2..838f347c2580 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_32.o crash_32.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
-obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
+obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module_32.o
 obj-y				+= sysenter_32.o vsyscall_32.o
diff --git a/trunk/arch/i386/kernel/summit.c b/trunk/arch/i386/kernel/summit_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/summit.c
rename to trunk/arch/i386/kernel/summit_32.c