From 0011db12a28d9dc3d225c65613a4a06e57439eb5 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:11 +0200 Subject: [PATCH] --- yaml --- r: 65452 b: refs/heads/master c: b34ab7a13d18e2f6ef1241db1a6209fb43478aa3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{pci-dma.c => pci-dma_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{pci-dma.c => pci-dma_64.c} (100%) diff --git a/[refs] b/[refs] index 23f55077b62c..da6f4f8a548b 100644 --- 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 index d71bbfb2dd10..8501605ec26a 100644 --- 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 b/trunk/arch/x86_64/kernel/pci-dma_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/pci-dma.c rename to trunk/arch/x86_64/kernel/pci-dma_64.c