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
/
tokenring
/
madgemc.c
diff --git
a/drivers/net/tokenring/madgemc.c
b/drivers/net/tokenring/madgemc.c
index
19e6f4d
..
666bbaa
100644
(file)
--- a/
drivers/net/tokenring/madgemc.c
+++ b/
drivers/net/tokenring/madgemc.c
@@
-311,7
+311,7
@@
static int __devinit madgemc_probe(struct device *device)
*/
outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
madgemc_setsifsel(dev, 1);
- if (request_irq(dev->irq, madgemc_interrupt,
SA_SHIRQ
,
+ if (request_irq(dev->irq, madgemc_interrupt,
IRQF_SHARED
,
"madgemc", dev)) {
ret = -EBUSY;
goto getout3;