mv643xx_eth: Properly resolve merge conflict.

The second SET_NETDEV_DEV() in the hunk should be removed. Reported-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
multipath-tcp · Oct 31, 2016 · 2a43ca0 · 2a43ca0
1 parent d8e4aa0
commit 2a43ca0
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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);