diff --git a/[refs] b/[refs]
index a687583d7659..656800658a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 930eed490ca02aaad6aa1bd10614a2b70cf621c6
+refs/heads/master: 668a3bf76e56f019fee46210531f94cf6b418bbd
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 0af9b0c11cb8..ff2909a97441 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y := head.o init_task_32.o vmlinux.lds
 
-obj-y	:= process_32.o signal_32.o entry.o traps_32.o irq_32.o \
+obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
 		pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\
 		quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o
diff --git a/trunk/arch/i386/kernel/entry.S b/trunk/arch/i386/kernel/entry_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/entry.S
rename to trunk/arch/i386/kernel/entry_32.S