Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / scsi / aacraid / sa.c

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 2244f31..e66477c 100644 (file)
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -387,8 +387,7 @@ int aac_sa_init(struct aac_dev *dev)
                goto error_irq;
        dev->sync_mode = 0;     /* sync. mode not supported */
        if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
-                       IRQF_SHARED|IRQF_DISABLED,
-                       "aacraid", (void *)dev ) < 0) {
+                       IRQF_SHARED, "aacraid", (void *)dev) < 0) {
                printk(KERN_WARNING "%s%d: Interrupt unavailable.\n",
                        name, instance);
                goto error_iounmap;