1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index beed4fa10c6e..8c70686d43a1 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -99,7 +99,6 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/mca-legacy.h>
@@ -625,7 +624,7 @@ static int init586(struct net_device *dev)
         volatile struct iasetup_cmd_struct *ias_cmd;
         volatile struct tdr_cmd_struct *tdr_cmd;
         volatile struct mcsetup_cmd_struct *mc_cmd;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         int num_addrs = netdev_mc_count(dev);
 
         ptr = (void *) ((char *) p->scb + sizeof(struct scb_struct));
@@ -788,8 +787,9 @@ static int init586(struct net_device *dev)
                         mc_cmd->cmd_link = 0xffff;
                         mc_cmd->mc_cnt = num_addrs * 6;
                         i = 0;
-                        netdev_for_each_mc_addr(dmi, dev)
-                                memcpy((char *) mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
+                        netdev_for_each_mc_addr(ha, dev)
+                                memcpy((char *) mc_cmd->mc_list[i++],
+                                       ha->addr, 6);
                         p->scb->cbl_offset = make16(mc_cmd);
                         p->scb->cmd = CUC_START;
                         elmc_id_attn586();