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

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index d762fe46251e..f3b46f71e293 100644
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -30,6 +30,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 #include <linux/arcdevice.h>
 
@@ -501,7 +502,7 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem
                 goto err_free_dev;
 
         /* reserve the irq */
-        if (request_irq(airq, &arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
+        if (request_irq(airq, arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
                 BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq);
                 goto err_release_mem;
         }