mv643xx_eth: Fix merge error.

Browse source

One merge conflict block wasn't resolved.

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2016-10-31 08:59:27 -04:00

parent 0a6ce1e3c1

commit d8e4aa0707

1 changed files with 0 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/net/ethernet/marvell/mv643xx_eth.c

View file