diff --git a/[refs] b/[refs]
index cc2a01d5a500..7488d1ad23b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d9a6e6128dd8ada0d2feed2a9bb6506043e4655
+refs/heads/master: f20b11e716936f85850654c49e06a1f955b9e5fc
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index f71a76ef2596..2a53ad2cb450 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -18,7 +18,7 @@ CFLAGS_tsc_64.o		:= $(nostackp)
 obj-y			:= process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
 obj-y			+= traps_$(BITS).o irq_$(BITS).o
 obj-y			+= time_$(BITS).o ioport.o ldt.o
-obj-y			+= setup_$(BITS).o i8259.o i8259_$(BITS).o setup.o
+obj-y			+= setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o
 obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o setup64.o
diff --git a/trunk/arch/x86/kernel/i8259_32.c b/trunk/arch/x86/kernel/irqinit_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/i8259_32.c
rename to trunk/arch/x86/kernel/irqinit_32.c
diff --git a/trunk/arch/x86/kernel/i8259_64.c b/trunk/arch/x86/kernel/irqinit_64.c
similarity index 100%
rename from trunk/arch/x86/kernel/i8259_64.c
rename to trunk/arch/x86/kernel/irqinit_64.c