X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fa100u2w.c;fp=drivers%2Fscsi%2Fa100u2w.c;h=9f45ae1745da7eb0a8190a9a9b84d4f35d099b6c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=d7e9fab54c60eb5a4ff1ae6505ecc72b1b702311;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index d7e9fab54..9f45ae174 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -89,7 +89,6 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1053,7 +1052,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
 
 	if (pci_enable_device(pdev))
 		goto out;
-	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+	if (pci_set_dma_mask(pdev, 0xffffffffULL)) {
 		printk(KERN_WARNING "Unable to set 32bit DMA "
 				    "on inia100 adapter, ignoring.\n");
 		goto out_disable_device;
@@ -1120,7 +1119,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
 	shost->sg_tablesize = TOTAL_SG_ENTRY;
 
 	/* Initial orc chip           */
-	error = request_irq(pdev->irq, inia100_intr, IRQF_SHARED,
+	error = request_irq(pdev->irq, inia100_intr, SA_SHIRQ,
 			"inia100", shost);
 	if (error < 0) {
 		printk(KERN_WARNING "inia100: unable to get irq %d\n",