[PATCH] dma64_addr_t fix ups

This patch fixes up two places whre dma64_addr_t is used incorrectly.
Note that pci_dev->dma_mask and the second argument to
blk_queue_bounce_limit() are both u64, so the old types clearly are
wrong (besides, dma64_addr_t is supposed to be used only with the
pci_dac_*() routines, as per DaveM's earlier mail).

	--david

drivers/ide/ide-dma.c

@@ -553,7 +553,7 @@ static ide_startstop_t ide_dma_timeout_revovery (ide_drive_t *drive)
 
 static void ide_toggle_bounce(ide_drive_t *drive, int on)
 {
-	dma64_addr_t addr = BLK_BOUNCE_HIGH;
+	u64 addr = BLK_BOUNCE_HIGH;
 
 	if (on && drive->media == ide_disk && HWIF(drive)->highmem) {
 		if (!PCI_DMA_BUS_IS_PHYS)

drivers/scsi/scsi_merge.c

@@ -123,7 +123,7 @@ void scsi_initialize_merge_fn(Scsi_Device * SDpnt)
 {
 	struct Scsi_Host *SHpnt = SDpnt->host;
 	request_queue_t *q = &SDpnt->request_queue;
-	dma64_addr_t bounce_limit;
+	u64 bounce_limit;
 
 	/*
 	 * The generic merging functions work just fine for us.