Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[~andy/linux] / drivers / net / a2065.c

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 71165ac0257a4deba97110e011f7fee23e0e247b..f4ea62641acd59c41958bc96721051045f171bd3 100644 (file)
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -48,7 +48,6 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 #include <linux/zorro.h>
@@ -496,7 +495,7 @@ static int lance_open (struct net_device *dev)
        ll->rdp = LE_C0_STOP;
 
        /* Install the Interrupt handler */
-       ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,
+       ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret) return ret;