diff options
author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /drivers/scsi/arm/powertec.c | |
parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
download | linux-67dadcb324c2fe059cb2c35f8b80df42bb23f7c4.tar.bz2 |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'drivers/scsi/arm/powertec.c')
-rw-r--r-- | drivers/scsi/arm/powertec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index abc9593615e9..5e1b73e1b743 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -358,7 +358,7 @@ static int powertecscsi_probe(struct expansion_card *ec, goto out_free; ret = request_irq(ec->irq, powertecscsi_intr, - IRQF_DISABLED, "powertec", info); + 0, "powertec", info); if (ret) { printk("scsi%d: IRQ%d not free: %d\n", host->host_no, ec->irq, ret); |