diff --git a/[refs] b/[refs]
index 42a135d5b767..cdba17580dbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 185bfbf6fac3e5bf8cd19c84aa520438a7d70022
+refs/heads/master: 5250d969f281b9f1ca581245a8797a5b7055c959
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 559f1f77185b..a677aaba33cd 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic_32.o
 obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups.o
-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_32.o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
diff --git a/trunk/arch/i386/kernel/relocate_kernel.S b/trunk/arch/i386/kernel/relocate_kernel_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/relocate_kernel.S
rename to trunk/arch/i386/kernel/relocate_kernel_32.S