Pull battery into test branch

[linux-2.6-omap-h63xx.git] / drivers / net / sunlance.c

diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 2c239ab63a80e1877df202cb88fd8116a2bd9d87..1ef9fd39a79a9cfc3b1dacb6235088a0c0525e5d 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -71,7 +71,6 @@
 
 static char lancestr[] = "LANCE";
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -931,7 +930,7 @@ static int lance_open(struct net_device *dev)
 
        STOP_LANCE(lp);
 
-       if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ,
+       if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED,
                        lancestr, (void *) dev)) {
                printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
                return -EAGAIN;