summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-10-31 10:33:08 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-31 10:33:08 -0400
commit2a43ca0aa9084c41aaa1006fbf22155b2e94babf (patch)
tree6990b05cd4d75578998d48cab4af4334140b5eb8
parentd8e4aa070751bfd646b8692cc12b0ee7e55d3266 (diff)
mv643xx_eth: Properly resolve merge conflict.
The second SET_NETDEV_DEV() in the hunk should be removed. Reported-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 69451b1cfd9a..6749b831998c 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3224,8 +3224,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
dev->min_mtu = 64;
dev->max_mtu = 9500;
- SET_NETDEV_DEV(dev, &pdev->dev);
-
if (mp->shared->win_protect)
wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);