git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' into upstream
[pandora-kernel.git]
/
drivers
/
net
/
ibmlana.c
diff --git
a/drivers/net/ibmlana.c
b/drivers/net/ibmlana.c
index
51fd516
..
2a95d72
100644
(file)
--- a/
drivers/net/ibmlana.c
+++ b/
drivers/net/ibmlana.c
@@
-782,7
+782,7
@@
static int ibmlana_open(struct net_device *dev)
/* register resources - only necessary for IRQ */
/* register resources - only necessary for IRQ */
- result = request_irq(priv->realirq, irq_handler,
SA_SHIRQ | SA
_SAMPLE_RANDOM, dev->name, dev);
+ result = request_irq(priv->realirq, irq_handler,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, dev->name, dev);
if (result != 0) {
printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
return result;
if (result != 0) {
printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
return result;