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

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index f60309175ef5..3ea42ff17657 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -117,7 +117,6 @@ static const char version[] =
 #include <linux/fcntl.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
@@ -249,11 +248,11 @@ static int __init el1_probe1(struct net_device *dev, int ioaddr)
          *      for the Sager NP943 prefix.
          */
 
-        if (station_addr[0] == 0x02  &&  station_addr[1] == 0x60
-                                                && station_addr[2] == 0x8c)
+        if (station_addr[0] == 0x02 && station_addr[1] == 0x60 &&
+            station_addr[2] == 0x8c)
                 mname = "3c501";
-        else if (station_addr[0] == 0x00  &&  station_addr[1] == 0x80
-                                                && station_addr[2] == 0xC8)
+        else if (station_addr[0] == 0x00 && station_addr[1] == 0x80 &&
+                 station_addr[2] == 0xC8)
                 mname = "NP943";
         else {
                 release_region(ioaddr, EL1_IO_EXTENT);
@@ -345,7 +344,7 @@ static int el_open(struct net_device *dev)
         if (el_debug > 2)
                 pr_debug("%s: Doing el_open()...\n", dev->name);
 
-        retval = request_irq(dev->irq, &el_interrupt, 0, dev->name, dev);
+        retval = request_irq(dev->irq, el_interrupt, 0, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -812,7 +811,7 @@ static void set_multicast_list(struct net_device *dev)
         if (dev->flags & IFF_PROMISC) {
                 outb(RX_PROM, RX_CMD);
                 inb(RX_STATUS);
-        } else if (dev->mc_list || dev->flags & IFF_ALLMULTI) {
+        } else if (!netdev_mc_empty(dev) || dev->flags & IFF_ALLMULTI) {
                 /* Multicast or all multicast is the same */
                 outb(RX_MULT, RX_CMD);
                 inb(RX_STATUS);         /* Clear status. */