git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
r8169.c
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 12d1cb289bb0849ee6bae315a48492595b9261fb..16a0ef1b1369cd27cad05af34fca13dcc7886b0a 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-1726,7
+1726,7
@@
static int rtl8169_open(struct net_device *dev)
rtl8169_set_rxbufsize(tp, dev);
retval =
- request_irq(dev->irq, rtl8169_interrupt,
SA_SHIRQ
, dev->name, dev);
+ request_irq(dev->irq, rtl8169_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval < 0)
goto out;