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

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 39246d457ac2..374832cca11f 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -37,7 +37,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -335,7 +334,7 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr)
 
 #if 0
         {
-                 int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev);
+                 int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev);
                  if (irqval) {
                          printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
                                          dev->irq, irqval);
@@ -367,7 +366,7 @@ static int seeq8005_open(struct net_device *dev)
         struct net_local *lp = netdev_priv(dev);
 
         {
-                 int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev);
+                 int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev);
                  if (irqval) {
                          printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
                                          dev->irq, irqval);