git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git]
/
drivers
/
scsi
/
arm
/
cumana_2.c
diff --git
a/drivers/scsi/arm/cumana_2.c
b/drivers/scsi/arm/cumana_2.c
index
fad2109
..
719af0d
100644
(file)
--- 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)
goto out_free;
ret = request_irq(ec->irq, cumanascsi_2_intr,
-
SA_INTERRUPT
, "cumanascsi2", info);
+
IRQF_DISABLED
, "cumanascsi2", info);
if (ret) {
printk("scsi%d: IRQ%d not free: %d\n",
host->host_no, ec->irq, ret);