diff --git a/[refs] b/[refs]
index da6f4f8a548b..f4822a5b53aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b34ab7a13d18e2f6ef1241db1a6209fb43478aa3
+refs/heads/master: 8d7083f3b038c0196ae0f9f161f8a49e85cde164
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 8501605ec26a..12b3ff88f2bf 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -5,7 +5,7 @@
 extra-y 	:= head.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
-		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
+		ptrace.o time.o ioport.o ldt.o setup.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
 		pci-dma_64.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
diff --git a/trunk/arch/x86_64/kernel/i8259.c b/trunk/arch/x86_64/kernel/i8259_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/i8259.c
rename to trunk/arch/x86_64/kernel/i8259_64.c