---

yaml --- r: 145596 b: refs/heads/master c: 31cb45e h: refs/heads/master v: v3
git-mirror · Apr 10, 2009 · a506dc8 · a506dc8
1 parent af8ab14
commit a506dc8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 279 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab19c25abd14db28d7454f00805ea59f22ed6057
+refs/heads/master: 31cb45ef2600d47191d51253ec94b5e3f689260d
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/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/trunk/arch/x86/kernel/irqinit_32.c → trunk/arch/x86/kernel/irqinit.c b/trunk/arch/x86/kernel/irqinit_32.c → trunk/arch/x86/kernel/irqinit.c
diff --git a/trunk/arch/x86/kernel/irqinit_64.c b/trunk/arch/x86/kernel/irqinit_64.c