From c4ddc402a37d1d92b634011febfbe5924fc6a33a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 8 May 2002 20:35:57 -0700 Subject: [PATCH] moved the pci_alloc_consistent() and pci_free_consistent() functions back into arch/i386/kernel as they are needed even if CONFIG_PCI is not enabled. --- arch/i386/kernel/Makefile | 2 +- arch/i386/{pci/dma.c => kernel/pci-dma.c} | 0 arch/i386/pci/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/i386/{pci/dma.c => kernel/pci-dma.c} (100%) diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 0dc76663bff6..4b1ddecc45b8 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -18,7 +18,7 @@ export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \ - i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \ + pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \ bootflag.o obj-$(CONFIG_MCA) += mca.o diff --git a/arch/i386/pci/dma.c b/arch/i386/kernel/pci-dma.c similarity index 100% rename from arch/i386/pci/dma.c rename to arch/i386/kernel/pci-dma.c diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile index 0a905368a11e..d0fa50db6aca 100644 --- a/arch/i386/pci/Makefile +++ b/arch/i386/pci/Makefile @@ -1,6 +1,6 @@ O_TARGET := pci.o -obj-y := dma.o i386.o +obj-y := i386.o ifdef CONFIG_VISWS obj-y += visws.o -- 2.39.5