Skip to content
Commit 2a43ca0a authored by David S. Miller's avatar David S. Miller
Browse files

mv643xx_eth: Properly resolve merge conflict.



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

Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8e4aa07
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment