tree 6990b05cd4d75578998d48cab4af4334140b5eb8
parent d8e4aa070751bfd646b8692cc12b0ee7e55d3266
author David S. Miller <davem@davemloft.net> 1477924388 -0400
committer David S. Miller <davem@davemloft.net> 1477924388 -0400

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>