projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '83xx' into for_paulus
[powerpc.git]
/
drivers
/
net
/
defxx.c
diff --git
a/drivers/net/defxx.c
b/drivers/net/defxx.c
index
5acd35c
..
91cc8cb
100644
(file)
--- a/
drivers/net/defxx.c
+++ b/
drivers/net/defxx.c
@@
-1228,7
+1228,7
@@
static int dfx_open(struct net_device *dev)
/* Register IRQ - support shared interrupts by passing device ptr */
/* Register IRQ - support shared interrupts by passing device ptr */
- ret = request_irq(dev->irq, dfx_interrupt,
SA_SHIRQ
, dev->name, dev);
+ ret = request_irq(dev->irq, dfx_interrupt,
IRQF_SHARED
, dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
return ret;
if (ret) {
printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
return ret;