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>

parent d8e4aa07

drivers/net/ethernet/marvell/mv643xx_eth.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);