---

yaml --- r: 65375 b: refs/heads/master c: 549c64a h: refs/heads/master i: 65373: e502237 65371: 19624dd 65367: 06e36ec 65359: 64a399c 65343: 7bf1215 v: v3
git-mirror · Oct 11, 2007 · 7c1a239 · 7c1a239
1 parent 11b76f7
commit 7c1a239
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: 016f8118b4f333cf88237918245be94788f0c51a
+refs/heads/master: 549c64ac41fd37236543143a4e92699958a3972e
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -5,7 +5,7 @@
 extra-y := head.o init_task.o vmlinux.lds
 
 obj-y	:= process.o signal.o entry.o traps_32.o irq.o \
-		ptrace.o time.o ioport.o ldt.o setup.o i8259_32.o sys_i386_32.o \
+		ptrace.o time.o ioport.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \
 		pci-dma_32.o i386_ksyms.o i387.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/setup.c → trunk/arch/i386/kernel/setup_32.c b/trunk/arch/i386/kernel/setup.c → trunk/arch/i386/kernel/setup_32.c