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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
um
/
drivers
/
net_kern.c
diff --git
a/arch/um/drivers/net_kern.c
b/arch/um/drivers/net_kern.c
index
085decb
..
8c7279b
100644
(file)
--- a/
arch/um/drivers/net_kern.c
+++ b/
arch/um/drivers/net_kern.c
@@
-5,6
+5,7
@@
* Licensed under the GPL.
*/
* Licensed under the GPL.
*/
+#include "linux/config.h"
#include "linux/kernel.h"
#include "linux/netdevice.h"
#include "linux/rtnetlink.h"
#include "linux/kernel.h"
#include "linux/netdevice.h"
#include "linux/rtnetlink.h"
@@
-127,7
+128,7
@@
static int uml_net_open(struct net_device *dev)
}
err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
}
err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
-
IRQF_DISABLED | IRQF_SHARED
, dev->name, dev);
+
SA_INTERRUPT | SA_SHIRQ
, dev->name, dev);
if(err != 0){
printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
err = -ENETUNREACH;
if(err != 0){
printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
err = -ENETUNREACH;