From: Arnd Bergmann Date: Mon, 3 Jun 2013 11:36:50 +0000 (+0000) Subject: net: sun4i-emac: remove erroneous assignment X-Git-Tag: v3.11-rc1~16^2~180 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10e179e364beafc23d837e81cf98d99720f42551;p=platform%2Fkernel%2Flinux-exynos.git 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 Cc: Stefan Roese Cc: Maxime Ripard Cc: Richard Genoud Acked-by: Stefan Roese Acked-by: Maxime Ripard Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 26083cd..0bb2f4a 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 */