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
/
rrunner.c
diff --git
a/drivers/net/rrunner.c
b/drivers/net/rrunner.c
index
19c2df9
..
c3ed734
100644
(file)
--- a/
drivers/net/rrunner.c
+++ b/
drivers/net/rrunner.c
@@
-28,7
+28,6
@@
#define RX_DMA_SKBUFF 1
#define PKT_COPY_THRESHOLD 512
#define RX_DMA_SKBUFF 1
#define PKT_COPY_THRESHOLD 512
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/errno.h>
@@
-1253,7
+1252,7
@@
static int rr_open(struct net_device *dev)
readl(®s->HostCtrl);
spin_unlock_irqrestore(&rrpriv->lock, flags);
readl(®s->HostCtrl);
spin_unlock_irqrestore(&rrpriv->lock, flags);
- if (request_irq(dev->irq, rr_interrupt,
SA_SHIRQ
, dev->name, dev)) {
+ if (request_irq(dev->irq, rr_interrupt,
IRQF_SHARED
, dev->name, dev)) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
dev->name, dev->irq);
ecode = -EAGAIN;
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
dev->name, dev->irq);
ecode = -EAGAIN;