From: David S. Miller Date: Mon, 31 Oct 2016 14:33:08 +0000 (-0400) Subject: mv643xx_eth: Properly resolve merge conflict. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a43ca0aa9084c41aaa1006fbf22155b2e94babf;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git mv643xx_eth: Properly resolve merge conflict. The second SET_NETDEV_DEV() in the hunk should be removed. Reported-by: Andrew Lunn Signed-off-by: David S. Miller --- 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);