---

yaml --- r: 65394 b: refs/heads/master c: b352b7f h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 37b5e8d · 37b5e8d
1 parent 116066c
commit 37b5e8d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8260dc37916c12b36e9732a8fa5bfa8c5fa8f0c4
+refs/heads/master: b352b7fe2271c48600a71f50546b8a3567a0e7fe
diff --git 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_32.o entry.o traps_32.o irq.o \
+obj-y	:= process.o signal_32.o entry.o traps_32.o irq_32.o \
 		ptrace_32.o time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \
 		pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\
 		quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o

diff --git a/trunk/arch/i386/kernel/irq.c → trunk/arch/i386/kernel/irq_32.c b/trunk/arch/i386/kernel/irq.c → trunk/arch/i386/kernel/irq_32.c