---

yaml --- r: 65381 b: refs/heads/master c: eea21b3 h: refs/heads/master i: 65379: 5b2cc25 v: v3
git-mirror · Oct 11, 2007 · 7efb629 · 7efb629
1 parent 8083faf
commit 7efb629
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: 24d8d25f1563f25c365cc6895bfc88af0b90ee40
+refs/heads/master: eea21b3055b76705a718b6864152d8ec85cbe942
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds
 
 obj-y	:= process.o signal_32.o entry.o traps_32.o irq.o \
 		ptrace.o time.o ioport_32.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\
+		pci-dma_32.o i386_ksyms.o i387_32.o bootflag.o e820_32.o\
 		quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

diff --git a/trunk/arch/i386/kernel/i387.c → trunk/arch/i386/kernel/i387_32.c b/trunk/arch/i386/kernel/i387.c → trunk/arch/i386/kernel/i387_32.c