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
/
pcmcia
/
nsp_cs.c
diff --git
a/drivers/scsi/pcmcia/nsp_cs.c
b/drivers/scsi/pcmcia/nsp_cs.c
index
231f9c3
..
0d4c04e
100644
(file)
--- a/
drivers/scsi/pcmcia/nsp_cs.c
+++ b/
drivers/scsi/pcmcia/nsp_cs.c
@@
-1623,7
+1623,7
@@
static int nsp_cs_probe(struct pcmcia_device *link)
/* Interrupt handler */
link->irq.Handler = &nspintr;
link->irq.Instance = info;
/* Interrupt handler */
link->irq.Handler = &nspintr;
link->irq.Instance = info;
- link->irq.Attributes |=
(SA_SHIRQ | SA_SAMPLE_RANDOM)
;
+ link->irq.Attributes |=
IRQF_SHARED
;
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;