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
/
wan
/
sbni.c
diff --git
a/drivers/net/wan/sbni.c
b/drivers/net/wan/sbni.c
index
175ba13
..
fc75bec
100644
(file)
--- a/
drivers/net/wan/sbni.c
+++ b/
drivers/net/wan/sbni.c
@@
-37,7
+37,6
@@
* Known problem: this driver wasn't tested on multiprocessor machine.
*/
* Known problem: this driver wasn't tested on multiprocessor machine.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>
@@
-1193,7
+1192,7
@@
sbni_open( struct net_device *dev )
}
}
}
}
- if( request_irq(dev->irq, sbni_interrupt,
SA_SHIRQ
, dev->name, dev) ) {
+ if( request_irq(dev->irq, sbni_interrupt,
IRQF_SHARED
, dev->name, dev) ) {
printk( KERN_ERR "%s: unable to get IRQ %d.\n",
dev->name, dev->irq );
return -EAGAIN;
printk( KERN_ERR "%s: unable to get IRQ %d.\n",
dev->name, dev->irq );
return -EAGAIN;