aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/NCR5380.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2014-03-05 00:09:41 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-19 18:04:44 -0400
commit4909cc2b89715c2dfd4c466a37cc08b2b3890fed (patch)
treeec1265c77c00c04ba212fbaff3033b9994d97343 /drivers/scsi/NCR5380.c
parentaa8033705eee0a2f682bd64974ea12e224e8aab5 (diff)
[SCSI] remove deprecated IRQF_DISABLED from SCSI
It's a NOOP since 2.6.35 and it will be removed one day. [jejb: remove from missed arm scsi drivers] Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r--drivers/scsi/NCR5380.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 1e9d6ad9302b..bcd223868227 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -584,7 +584,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,
584 NCR5380_setup(instance); 584 NCR5380_setup(instance);
585 585
586 for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1) 586 for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1)
587 if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0)) 587 if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))
588 trying_irqs |= mask; 588 trying_irqs |= mask;
589 589
590 timeout = jiffies + (250 * HZ / 1000); 590 timeout = jiffies + (250 * HZ / 1000);