---

yaml --- r: 65372 b: refs/heads/master c: 5d43542 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · acfc06e · acfc06e
1 parent 19624dd
commit acfc06e
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: a6424facfa0fceb57982df3a6d7e6166c94c22be
+refs/heads/master: 5d43542f0c223e3643d88adb05ed466e6f0c8337
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.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 \
-		pci-dma_32.o i386_ksyms.o i387.o bootflag.o e820.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
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

diff --git a/trunk/arch/i386/kernel/e820.c → trunk/arch/i386/kernel/e820_32.c b/trunk/arch/i386/kernel/e820.c → trunk/arch/i386/kernel/e820_32.c