aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/allwinner
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-03 11:36:50 +0000
committerDavid S. Miller <davem@davemloft.net>2013-06-04 17:34:00 -0700
commit10e179e364beafc23d837e81cf98d99720f42551 (patch)
tree8d29dafa066d128b5c0e9244747e9ab3f02cd4d9 /drivers/net/ethernet/allwinner
parentmlx4: use __netdev_pick_tx instead of __skb_tx_hash in mlx4_en_select_queue (diff)
downloadlinux-dev-10e179e364beafc23d837e81cf98d99720f42551.tar.xz
linux-dev-10e179e364beafc23d837e81cf98d99720f42551.zip
net: sun4i-emac: remove erroneous assignment
The newly added sun4i-emac driver causes a build error when CONFIG_NET_POLL_CONTROLLER is set, because it attempts to assign a pointer to netdev->poll_controller, which has been replaced with ops->ndo_poll_controller in 2.6.31! The correct assignment is present as well, so we just need to remove the wrong one. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Stefan Roese <sr@denx.de> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Richard Genoud <richard.genoud@gmail.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Maxime Ripard <maxime.ripard@anandra.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/allwinner')
-rw-r--r--drivers/net/ethernet/allwinner/sun4i-emac.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 26083cdc25ab..0bb2f4af9952 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
ndev->ethtool_ops = &emac_ethtool_ops;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- ndev->poll_controller = &emac_poll_controller;
-#endif
-
platform_set_drvdata(pdev, ndev);
/* Carrier starts down, phylib will bring it up */