Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 651275a5f3d2..c9e459400ff9 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -29,7 +29,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -200,7 +199,7 @@ int com20020_found(struct net_device *dev, int shared)
         outb(dev->dev_addr[0], _XREG);
 
         /* reserve the irq */
-        if (request_irq(dev->irq, &arcnet_interrupt, shared,
+        if (request_irq(dev->irq, arcnet_interrupt, shared,
                         "arcnet (COM20020)", dev)) {
                 BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
                 return -ENODEV;