diff options
Diffstat (limited to 'drivers/scsi/arm')
-rw-r--r-- | drivers/scsi/arm/acornscsi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_1.c | 2 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_2.c | 2 | ||||
-rw-r--r-- | drivers/scsi/arm/powertec.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 1b9900b58956..7621e3fa37b1 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c | |||
@@ -3030,7 +3030,7 @@ acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
3030 | if (!request_region(host->io_port, 2048, "acornscsi(ram)")) | 3030 | if (!request_region(host->io_port, 2048, "acornscsi(ram)")) |
3031 | goto err_5; | 3031 | goto err_5; |
3032 | 3032 | ||
3033 | ret = request_irq(host->irq, acornscsi_intr, SA_INTERRUPT, "acornscsi", ashost); | 3033 | ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost); |
3034 | if (ret) { | 3034 | if (ret) { |
3035 | printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n", | 3035 | printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n", |
3036 | host->host_no, ashost->scsi.irq, ret); | 3036 | host->host_no, ashost->scsi.irq, ret); |
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index e6c9491dc5c0..3bdfc36481ae 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c | |||
@@ -277,7 +277,7 @@ cumanascsi1_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
277 | ((struct NCR5380_hostdata *)host->hostdata)->ctrl = 0; | 277 | ((struct NCR5380_hostdata *)host->hostdata)->ctrl = 0; |
278 | outb(0x00, host->io_port - 577); | 278 | outb(0x00, host->io_port - 577); |
279 | 279 | ||
280 | ret = request_irq(host->irq, cumanascsi_intr, SA_INTERRUPT, | 280 | ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED, |
281 | "CumanaSCSI-1", host); | 281 | "CumanaSCSI-1", host); |
282 | if (ret) { | 282 | if (ret) { |
283 | printk("scsi%d: IRQ%d not free: %d\n", | 283 | printk("scsi%d: IRQ%d not free: %d\n", |
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index fad2109268bb..719af0dcc0e5 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c | |||
@@ -460,7 +460,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
460 | goto out_free; | 460 | goto out_free; |
461 | 461 | ||
462 | ret = request_irq(ec->irq, cumanascsi_2_intr, | 462 | ret = request_irq(ec->irq, cumanascsi_2_intr, |
463 | SA_INTERRUPT, "cumanascsi2", info); | 463 | IRQF_DISABLED, "cumanascsi2", info); |
464 | if (ret) { | 464 | if (ret) { |
465 | printk("scsi%d: IRQ%d not free: %d\n", | 465 | printk("scsi%d: IRQ%d not free: %d\n", |
466 | host->host_no, ec->irq, ret); | 466 | host->host_no, ec->irq, ret); |
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 3d69f6c45a6b..b2c346a47052 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
@@ -373,7 +373,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
373 | goto out_free; | 373 | goto out_free; |
374 | 374 | ||
375 | ret = request_irq(ec->irq, powertecscsi_intr, | 375 | ret = request_irq(ec->irq, powertecscsi_intr, |
376 | SA_INTERRUPT, "powertec", info); | 376 | IRQF_DISABLED, "powertec", info); |
377 | if (ret) { | 377 | if (ret) { |
378 | printk("scsi%d: IRQ%d not free: %d\n", | 378 | printk("scsi%d: IRQ%d not free: %d\n", |
379 | host->host_no, ec->irq, ret); | 379 | host->host_no, ec->irq, ret); |