diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-10-31 08:59:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-31 08:59:27 -0400 |
| commit | d8e4aa070751bfd646b8692cc12b0ee7e55d3266 (patch) | |
| tree | 1056644953faf55e8b0d75c49f2ce79f958a825b /drivers/net/ethernet/marvell | |
| parent | Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma (diff) | |
| download | linux-dev-d8e4aa070751bfd646b8692cc12b0ee7e55d3266.tar.xz linux-dev-d8e4aa070751bfd646b8692cc12b0ee7e55d3266.zip | |
mv643xx_eth: Fix merge error.
One merge conflict block wasn't resolved.
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 8302c7e660ce..69451b1cfd9a 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -3220,15 +3220,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev) dev->priv_flags |= IFF_UNICAST_FLT; dev->gso_max_segs = MV643XX_MAX_TSO_SEGS; -<<<<<<< HEAD /* MTU range: 64 - 9500 */ dev->min_mtu = 64; dev->max_mtu = 9500; SET_NETDEV_DEV(dev, &pdev->dev); -======= ->>>>>>> 2a26d99b251b8625d27aed14e97fc10707a3a81f if (mp->shared->win_protect) wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect); |