---

yaml --- r: 65452 b: refs/heads/master c: b34ab7a h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 0011db1 · 0011db1
1 parent b44419b
commit 0011db1
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: 2a8eb13a0689439eb9c34be062e6a5284832bb02
+refs/heads/master: b34ab7a13d18e2f6ef1241db1a6209fb43478aa3
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-		pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
+		pci-dma_64.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

diff --git a/trunk/arch/x86_64/kernel/pci-dma.c → trunk/arch/x86_64/kernel/pci-dma_64.c b/trunk/arch/x86_64/kernel/pci-dma.c → trunk/arch/x86_64/kernel/pci-dma_64.c