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 <a...@arndb.de> Cc: Stefan Roese <s...@denx.de> Cc: Maxime Ripard <maxime.rip...@free-electrons.com> Cc: Richard Genoud <richard.gen...@gmail.com> --- diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index b411344..3e7b220 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/