X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fumem.c;h=4ada1268b40d1abda498b2eddf9ed6caa830a665;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=f7d4c65a7b8c369a76c3b7b82d8cb98ce03dcfa0;hpb=e6a27dba1cf83d871b2dfcd64f04f12a67e3f4d5;p=linux-2.6.git

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index f7d4c65a7..4ada1268b 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -50,7 +50,6 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/dma-mapping.h>
 
 #include <linux/fcntl.h>        /* O_ACCMODE */
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
@@ -882,8 +881,8 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
 	printk(KERN_INFO "Micro Memory(tm) controller #%d found at %02x:%02x (PCI Mem Module (Battery Backup))\n",
 	       card->card_number, dev->bus->number, dev->devfn);
 
-	if (pci_set_dma_mask(dev, DMA_64BIT_MASK) &&
-	    pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
+	if (pci_set_dma_mask(dev, 0xffffffffffffffffLL) &&
+	    pci_set_dma_mask(dev, 0xffffffffLL)) {
 		printk(KERN_WARNING "MM%d: NO suitable DMA found\n",num_cards);
 		return  -ENOMEM;
 	}
@@ -1132,7 +1131,7 @@ static void mm_pci_remove(struct pci_dev *dev)
 		pci_free_consistent(card->dev, PAGE_SIZE*2,
 				    card->mm_pages[1].desc,
 				    card->mm_pages[1].page_dma);
-	blk_cleanup_queue(card->queue);
+	blk_put_queue(card->queue);
 }
 
 static const struct pci_device_id mm_pci_ids[] = { {