Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index fe0c3f244562..c6ec61e0accf 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -829,6 +829,17 @@ fail:
         return NULL;
 }
 
+static const struct net_device_ops qec_ops = {
+        .ndo_open               = qe_open,
+        .ndo_stop               = qe_close,
+        .ndo_start_xmit         = qe_start_xmit,
+        .ndo_set_multicast_list = qe_set_multicast,
+        .ndo_tx_timeout         = qe_tx_timeout,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
 static int __devinit qec_ether_init(struct of_device *op)
 {
         static unsigned version_printed;
@@ -893,15 +904,11 @@ static int __devinit qec_ether_init(struct of_device *op)
 
         SET_NETDEV_DEV(dev, &op->dev);
 
-        dev->open = qe_open;
-        dev->stop = qe_close;
-        dev->hard_start_xmit = qe_start_xmit;
-        dev->set_multicast_list = qe_set_multicast;
-        dev->tx_timeout = qe_tx_timeout;
         dev->watchdog_timeo = 5*HZ;
         dev->irq = op->irqs[0];
         dev->dma = 0;
         dev->ethtool_ops = &qe_ethtool_ops;
+        dev->netdev_ops = &qec_ops;
 
         res = register_netdev(dev);
         if (res)