diff --git a/[refs] b/[refs]
index a875034da6db..9e03b3c89cd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b673187cba8a5bcd28455b8540d8542df1d85d9b
+refs/heads/master: 311d64ab6dab57a4e8b012aa0da0240cf1c167e4
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 9d33b00de659..bd44e20d2cd9 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y := head.o init_task.o vmlinux.lds
 
-obj-y	:= process.o signal.o entry.o traps.o irq.o \
+obj-y	:= process.o signal.o entry.o traps_32.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
 		pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
 		quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/traps.c
rename to trunk/arch/i386/kernel/traps_32.c