diff --git a/[refs] b/[refs]
index 8be6f64f1c9b..9079f02170b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7338d4357bb2c8f20e400432e1fe04a22cb868ad
+refs/heads/master: f797f57a60514eea6fc03644c14e80691dd25727
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 52b0041583cf..f31a7f039e94 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
-obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
+obj-$(CONFIG_EFI) 		+= efi.o efi_stub_32.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
diff --git a/trunk/arch/i386/kernel/efi_stub.S b/trunk/arch/i386/kernel/efi_stub_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/efi_stub.S
rename to trunk/arch/i386/kernel/efi_stub_32.S