Merge bk://linuxusb.bkbits.net/linux-2.5-pci

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

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

arch/i386/pci/Makefile

 O_TARGET        := pci.o
 
-obj-y		:= dma.o i386.o
+obj-y		:= i386.o
 
 ifdef	CONFIG_VISWS
 obj-y		+= visws.o