History

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

drivers/net/ethernet/marvell/mv643xx_eth.c+0−2
@@ -3224,8 +3224,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) · 3223 unmodified lines
32243224 dev->min_mtu = 64;
32253225 dev->max_mtu = 9500;
32263226
3227− SET_NETDEV_DEV(dev, &pdev->dev);
3228−
32293227 if (mp->shared->win_protect)
32303228 wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
32313229

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t