From 219cc7a189f58e60d9e1ed74083a9fbfd22cb347 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:11:54 +0200 Subject: [PATCH] --- yaml --- r: 65351 b: refs/heads/master c: de1afdd27e8d78cb53f9886202176abe3f3f950b h: refs/heads/master i: 65349: ee5b4d1f7dbcb2f89b5ada285c3263dae2f3649a 65347: c7e9c91047910a392d6e04fdb9fa9263a7965ccf 65343: 7bf1215a1df5ccfd750d1c5ec8b808f3be6112e2 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{pci-dma.c => pci-dma_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{pci-dma.c => pci-dma_32.c} (100%) diff --git a/[refs] b/[refs] index facec70717cf..f9bc080e74a3 100644 --- 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 index dd172402a4a0..c9dcdc0d7778 100644 --- 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 b/trunk/arch/i386/kernel/pci-dma_32.c similarity index 100% rename from trunk/arch/i386/kernel/pci-dma.c rename to trunk/arch/i386/kernel/pci-dma_32.c