---

yaml --- r: 65351 b: refs/heads/master c: de1afdd h: refs/heads/master i: 65349: ee5b4d1 65347: c7e9c91 65343: 7bf1215 v: v3
git-mirror · Oct 11, 2007 · 219cc7a · 219cc7a
1 parent b4b3363
commit 219cc7a
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: dd11bb664ca533825bf9454714a9635268321882
+refs/heads/master: de1afdd27e8d78cb53f9886202176abe3f3f950b
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.o sys_i386.o \
-		pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
+		pci-dma_32.o i386_ksyms.o i387.o bootflag.o e820.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/pci-dma.c → trunk/arch/i386/kernel/pci-dma_32.c b/trunk/arch/i386/kernel/pci-dma.c → trunk/arch/i386/kernel/pci-dma_32.c