3 files changed, 11 insertions, 12 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;
         }
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index aaf14d306a4a..79636ee35829 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -31,6 +31,7 @@
 #include <linux/ip.h>
 #include <linux/atalk.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/route.h>
 #include <asm/uaccess.h>
 
@@ -230,9 +231,9 @@ static int ipddp_delete(struct ipddp_route *rt)
         spin_lock_bh(&ipddp_route_lock);
         while((tmp = *r) != NULL)
         {
-                if(tmp->ip == rt->ip
-                        && tmp->at.s_net == rt->at.s_net
-                        && tmp->at.s_node == rt->at.s_node)
+                if(tmp->ip == rt->ip &&
+                   tmp->at.s_net == rt->at.s_net &&
+                   tmp->at.s_node == rt->at.s_node)
                 {
                         *r = tmp->next;
                         spin_unlock_bh(&ipddp_route_lock);
@@ -255,9 +256,9 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt)
 
         for(f = ipddp_route_list; f != NULL; f = f->next)
         {
-                if(f->ip == rt->ip
-                        && f->at.s_net == rt->at.s_net
-                        && f->at.s_node == rt->at.s_node)
+                if(f->ip == rt->ip &&
+                   f->at.s_net == rt->at.s_net &&
+                   f->at.s_node == rt->at.s_node)
                         return (f);
         }
 
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 08760baece7a..6af65b656f31 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -215,7 +215,6 @@ static int dma;
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -228,6 +227,7 @@ static int dma;
 #include <linux/timer.h>
 #include <linux/atalk.h>
 #include <linux/bitops.h>
+#include <linux/gfp.h>
 
 #include <asm/system.h>
 #include <asm/dma.h>
@@ -1125,7 +1125,6 @@ struct net_device * __init ltpc_probe(void)
                 printk(KERN_INFO "Apple/Farallon LocalTalk-PC card at %03x, DMA%d.  Using polled mode.\n",io,dma);
 
         dev->netdev_ops = &ltpc_netdev;
-        dev->mc_list = NULL;
         dev->base_addr = io;
         dev->irq = irq;
         dev->dma = dma;
@@ -1158,7 +1157,7 @@ struct net_device * __init ltpc_probe(void)
         }
 
         /* grab it and don't let go :-) */
-        if (irq && request_irq( irq, &ltpc_interrupt, 0, "ltpc", dev) >= 0)
+        if (irq && request_irq( irq, ltpc_interrupt, 0, "ltpc", dev) >= 0)
         {
                 (void) inb_p(io+7);  /* enable interrupts from board */
                 (void) inb_p(io+7);  /* and reset irq line */