Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[deliverable/linux.git] / drivers / scsi / initio.c

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 280d5af113d1deb851791ca2f9d254b6d45b149c..e5dae7b54d9a8c9bf093110b7cf39b187e5d8ddb 100644 (file)
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2931,7 +2931,7 @@ static int initio_probe_one(struct pci_dev *pdev,
        shost->base = host->addr;
        shost->sg_tablesize = TOTAL_SG_ENTRY;
 
-       error = request_irq(pdev->irq, i91u_intr, IRQF_DISABLED|IRQF_SHARED, "i91u", shost);
+       error = request_irq(pdev->irq, i91u_intr, IRQF_SHARED, "i91u", shost);
        if (error < 0) {
                printk(KERN_WARNING "initio: Unable to request IRQ %d\n", pdev->irq);
                goto out_free_scbs;