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
/
parport
/
parport_mfc3.c
diff --git
a/drivers/parport/parport_mfc3.c
b/drivers/parport/parport_mfc3.c
index
c853647
..
b2b8092
100644
(file)
--- a/
drivers/parport/parport_mfc3.c
+++ b/
drivers/parport/parport_mfc3.c
@@
-353,7
+353,7
@@
static int __init parport_mfc3_init(void)
if (p->irq != PARPORT_IRQ_NONE) {
if (use_cnt++ == 0)
if (p->irq != PARPORT_IRQ_NONE) {
if (use_cnt++ == 0)
- if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt,
SA_SHIRQ
, p->name, &pp_mfc3_ops))
+ if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt,
IRQF_SHARED
, p->name, &pp_mfc3_ops))
goto out_irq;
}
goto out_irq;
}