3 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index ef671739cfea..192bbc91c731 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3314,7 +3314,7 @@ static int __devexit hme_sbus_remove(struct of_device *dev)
         struct happy_meal *hp = dev_get_drvdata(&dev->dev);
         struct net_device *net_dev = hp->dev;
 
-        unregister_netdevice(net_dev);
+        unregister_netdev(net_dev);
 
         /* XXX qfe parent interrupt... */
 
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 5b00d79b5573..b0929a457b60 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1550,7 +1550,7 @@ static int __exit sunlance_sun4_remove(void)
         struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev);
         struct net_device *net_dev = lp->dev;
 
-        unregister_netdevice(net_dev);
+        unregister_netdev(net_dev);
 
         lance_free_hwresources(lp);
 
@@ -1590,7 +1590,7 @@ static int __devexit sunlance_sbus_remove(struct of_device *dev)
         struct lance_private *lp = dev_get_drvdata(&dev->dev);
         struct net_device *net_dev = lp->dev;
 
-        unregister_netdevice(net_dev);
+        unregister_netdev(net_dev);
 
         lance_free_hwresources(lp);
 
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 7874eb1ef043..f3bad56d476a 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -845,6 +845,8 @@ static int __init qec_ether_init(struct sbus_dev *sdev)
         if (!dev)
                 return -ENOMEM;
 
+        memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
+
         qe = netdev_priv(dev);
 
         i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);
@@ -960,7 +962,7 @@ static int __devexit qec_sbus_remove(struct of_device *dev)
         struct sunqe *qp = dev_get_drvdata(&dev->dev);
         struct net_device *net_dev = qp->dev;
 
-        unregister_netdevice(net_dev);
+        unregister_netdev(net_dev);
 
         sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
         sbus_iounmap(qp->mregs, MREGS_REG_SIZE);