git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
scsi
/
gvp11.c
diff --git
a/drivers/scsi/gvp11.c
b/drivers/scsi/gvp11.c
index
5b15449
..
a0d831b
100644
(file)
--- a/
drivers/scsi/gvp11.c
+++ b/
drivers/scsi/gvp11.c
@@
-328,7
+328,7
@@
int __init gvp11_detect(struct scsi_host_template *tpnt)
(epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
: WD33C93_FS_12_15);
(epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
: WD33C93_FS_12_15);
- request_irq(IRQ_AMIGA_PORTS, gvp11_intr,
SA_SHIRQ
, "GVP11 SCSI",
+ request_irq(IRQ_AMIGA_PORTS, gvp11_intr,
IRQF_SHARED
, "GVP11 SCSI",
instance);
DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
num_gvp11++;
instance);
DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
num_gvp11++;