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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
tulip
/
xircom_tulip_cb.c
diff --git
a/drivers/net/tulip/xircom_tulip_cb.c
b/drivers/net/tulip/xircom_tulip_cb.c
index aecafdabbc91a459db7d20a875ba559855ed0401..091ebb7a62f6013e12253e5b3855b7d3a4c6fd91 100644
(file)
--- a/
drivers/net/tulip/xircom_tulip_cb.c
+++ b/
drivers/net/tulip/xircom_tulip_cb.c
@@
-807,7
+807,7
@@
xircom_open(struct net_device *dev)
{
struct xircom_private *tp = netdev_priv(dev);
- if (request_irq(dev->irq, &xircom_interrupt,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, &xircom_interrupt,
IRQF_SHARED
, dev->name, dev))
return -EAGAIN;
xircom_up(dev);