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

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index b5dc7f550725..6f8d6206b5c4 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -56,7 +56,6 @@ static const char *version =
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -120,7 +119,7 @@ static int irq = 5;		/* Default IRQ */
  *      DAYNA driver mode:
  *              Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, 
  *              Farallon PhoneNET PC III, Farallon PhoneNET PC II
- *      Other cards possibly supported mode unkown though:
+ *      Other cards possibly supported mode unknown though:
  *              Dayna DL2000 (Full length), COPS LT/M (Micro-Channel)
  *
  *      Cards NOT supported by this driver but supported by the ltpc.c
@@ -328,7 +327,7 @@ static int __init cops_probe1(struct net_device *dev, int ioaddr)
 
         /* Reserve any actual interrupt. */
         if (dev->irq) {
-                retval = request_irq(dev->irq, &cops_interrupt, 0, dev->name, dev);
+                retval = request_irq(dev->irq, cops_interrupt, 0, dev->name, dev);
                 if (retval)
                         goto err_out;
         }