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
/
lanstreamer.c
diff --git
a/drivers/net/tokenring/lanstreamer.c
b/drivers/net/tokenring/lanstreamer.c
index
c58a4c3
..
28d968f
100644
(file)
--- a/
drivers/net/tokenring/lanstreamer.c
+++ b/
drivers/net/tokenring/lanstreamer.c
@@
-100,7
+100,6
@@
#define STREAMER_IOCTL 0
#define STREAMER_IOCTL 0
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-602,7
+601,7
@@
static int streamer_open(struct net_device *dev)
rc=streamer_reset(dev);
}
rc=streamer_reset(dev);
}
- if (request_irq(dev->irq, &streamer_interrupt,
SA_SHIRQ
, "lanstreamer", dev)) {
+ if (request_irq(dev->irq, &streamer_interrupt,
IRQF_SHARED
, "lanstreamer", dev)) {
return -EAGAIN;
}
#if STREAMER_DEBUG
return -EAGAIN;
}
#if STREAMER_DEBUG