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
/
ixp2000
/
ixpdev.c
diff --git
a/drivers/net/ixp2000/ixpdev.c
b/drivers/net/ixp2000/ixpdev.c
index
fbc2d21
..
6eeb965
100644
(file)
--- a/
drivers/net/ixp2000/ixpdev.c
+++ b/
drivers/net/ixp2000/ixpdev.c
@@
-9,7
+9,6
@@
* (at your option) any later version.
*/
* (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
@@
-236,7
+235,7
@@
static int ixpdev_open(struct net_device *dev)
if (!nds_open++) {
err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
if (!nds_open++) {
err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
-
SA_SHIRQ
, "ixp2000_eth", nds);
+
IRQF_SHARED
, "ixp2000_eth", nds);
if (err) {
nds_open--;
return err;
if (err) {
nds_open--;
return err;