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
/
net
/
sk_mca.c
diff --git
a/drivers/net/sk_mca.c
b/drivers/net/sk_mca.c
index
e5d6d95
..
799e098
100644
(file)
--- a/
drivers/net/sk_mca.c
+++ b/
drivers/net/sk_mca.c
@@
-824,7
+824,7
@@
static int skmca_open(struct net_device *dev)
/* register resources - only necessary for IRQ */
result =
request_irq(priv->realirq, irq_handler,
/* register resources - only necessary for IRQ */
result =
request_irq(priv->realirq, irq_handler,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM, "sk_mca", dev);
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, "sk_mca", dev);
if (result != 0) {
printk("%s: failed to register irq %d\n", dev->name,
dev->irq);
if (result != 0) {
printk("%s: failed to register irq %d\n", dev->name,
dev->irq);