x86: unify irqinit_{32,64}.c into irqinit.c

Impact: cleanup Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · Apr 10, 2009 · 31cb45e · 31cb45e
1 parent ab19c25
commit 31cb45e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 278 deletions.
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
@@ -28,7 +28,7 @@ CFLAGS_paravirt.o	:= $(nostackp)
 obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o
 obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y			+= time_$(BITS).o ioport.o ldt.o dumpstack.o
-obj-y			+= setup.o i8259.o irqinit_$(BITS).o
+obj-y			+= setup.o i8259.o irqinit.o
 obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o
 obj-$(CONFIG_X86_32)	+= probe_roms_32.o
 obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

diff --git a/arch/x86/kernel/irqinit_32.c → arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit_32.c → arch/x86/kernel/irqinit.c
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c