mv643xx_eth: Properly resolve merge conflict.

The second SET_NETDEV_DEV() in the hunk should be removed.

David S. Miller committed 10 years ago

Commit 2a43ca01 parent d8e4aa01 file · +0 −2Browse files

Unified · Split

@@ -3224,8 +3224,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) · 3223 unmodified lines
3224	dev->min_mtu = 64;	3224	dev->min_mtu = 64;
3225	dev->max_mtu = 9500;	3225	dev->max_mtu = 9500;
3226		3226
3227	SET_NETDEV_DEV(dev, &pdev->dev);
3228
3229	if (mp->shared->win_protect)	3227	if (mp->shared->win_protect)
3230	wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);	3228	wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
3231		3229

Keyboard shortcuts