diff options
Diffstat (limited to 'arch/powerpc/include/asm/floppy.h')
| -rw-r--r-- | arch/powerpc/include/asm/floppy.h | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h index 7af9a68fd949..f8ce178b43b7 100644 --- a/arch/powerpc/include/asm/floppy.h +++ b/arch/powerpc/include/asm/floppy.h @@ -134,17 +134,19 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)  	int dir;  	doing_vdma = 0; -	dir = (mode == DMA_MODE_READ) ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE; +	dir = (mode == DMA_MODE_READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;  	if (bus_addr   	    && (addr != prev_addr || size != prev_size || dir != prev_dir)) {  		/* different from last time -- unmap prev */ -		pci_unmap_single(isa_bridge_pcidev, bus_addr, prev_size, prev_dir); +		dma_unmap_single(&isa_bridge_pcidev->dev, bus_addr, prev_size, +				 prev_dir);  		bus_addr = 0;  	}  	if (!bus_addr)	/* need to map it */ -		bus_addr = pci_map_single(isa_bridge_pcidev, addr, size, dir); +		bus_addr = dma_map_single(&isa_bridge_pcidev->dev, addr, size, +					  dir);  	/* remember this one as prev */  	prev_addr = addr;  | 
