Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / scsi / a100u2w.c

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index c34403c30483ebb56fe8d21b4d2374c73cffd940..d7e9fab54c60eb5a4ff1ae6505ecc72b1b702311 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -89,6 +89,7 @@
 #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>
@@ -923,7 +924,7 @@ static int inia100_device_reset(struct scsi_cmnd * SCpnt)
 {                              /* I need Host Control Block Information */
        ORC_HCS *pHCB;
        pHCB = (ORC_HCS *) SCpnt->device->host->hostdata;
-       return orc_device_reset(pHCB, SCpnt, SCpnt->device->id);
+       return orc_device_reset(pHCB, SCpnt, scmd_id(SCpnt));
 
 }
 
@@ -1052,7 +1053,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
 
        if (pci_enable_device(pdev))
                goto out;
-       if (pci_set_dma_mask(pdev, 0xffffffffULL)) {
+       if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                printk(KERN_WARNING "Unable to set 32bit DMA "
                                    "on inia100 adapter, ignoring.\n");
                goto out_disable_device;
@@ -1119,7 +1120,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, SA_SHIRQ,
+       error = request_irq(pdev->irq, inia100_intr, IRQF_SHARED,
                        "inia100", shost);
        if (error < 0) {
                printk(KERN_WARNING "inia100: unable to get irq %d\n",