Commit 10e179e3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

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: default avatarArnd 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: default avatarStefan Roese <sr@denx.de>
Acked-by: default avatarMaxime Ripard <maxime.ripard@anandra.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c08355fb
...@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev) ...@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
ndev->watchdog_timeo = msecs_to_jiffies(watchdog); ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
ndev->ethtool_ops = &emac_ethtool_ops; ndev->ethtool_ops = &emac_ethtool_ops;
#ifdef CONFIG_NET_POLL_CONTROLLER
ndev->poll_controller = &emac_poll_controller;
#endif
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
/* Carrier starts down, phylib will bring it up */ /* Carrier starts down, phylib will bring it up */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment