1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index be637dce944c..72b579c8d812 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -602,7 +602,6 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev)
         qep->tx_new = NEXT_TX(entry);
 
         /* Get it going. */
-        dev->trans_start = jiffies;
         sbus_writel(CREG_CTRL_TWAKEUP, qep->qcregs + CREG_CTRL);
 
         dev->stats.tx_packets++;
@@ -627,7 +626,7 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static void qe_set_multicast(struct net_device *dev)
 {
         struct sunqe *qep = netdev_priv(dev);
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         u8 new_mconfig = qep->mconfig;
         char *addrs;
         int i;
@@ -651,8 +650,8 @@ static void qe_set_multicast(struct net_device *dev)
                 u8 *hbytes = (unsigned char *) &hash_table[0];
 
                 memset(hash_table, 0, sizeof(hash_table));
-                netdev_for_each_mc_addr(dmi, dev) {
-                        addrs = dmi->dmi_addr;
+                netdev_for_each_mc_addr(ha, dev) {
+                        addrs = ha->addr;
 
                         if (!(*addrs & 1))
                                 continue;
@@ -696,7 +695,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
         strcpy(info->version, "3.0");
 
         op = qep->op;
-        regs = of_get_property(op->node, "reg", NULL);
+        regs = of_get_property(op->dev.of_node, "reg", NULL);
         if (regs)
                 sprintf(info->bus_info, "SBUS:%d", regs->which_io);
 
@@ -800,7 +799,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
                         if (qec_global_reset(qecp->gregs))
                                 goto fail;
 
-                        qecp->qec_bursts = qec_get_burst(op->node);
+                        qecp->qec_bursts = qec_get_burst(op->dev.of_node);
 
                         qec_init_once(qecp, op);
 
@@ -858,7 +857,7 @@ static int __devinit qec_ether_init(struct of_device *op)
 
         res = -ENODEV;
 
-        i = of_getintprop_default(op->node, "channel#", -1);
+        i = of_getintprop_default(op->dev.of_node, "channel#", -1);
         if (i == -1)
                 goto fail;
         qe->channel = i;
@@ -978,8 +977,11 @@ static const struct of_device_id qec_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, qec_sbus_match);
 
 static struct of_platform_driver qec_sbus_driver = {
-        .name           = "qec",
-        .match_table    = qec_sbus_match,
+        .driver = {
+                .name = "qec",
+                .owner = THIS_MODULE,
+                .of_match_table = qec_sbus_match,
+        },
         .probe          = qec_sbus_probe,
         .remove         = __devexit_p(qec_sbus_remove),
 };