Stephen Rothwell 416377ea39 macb: Fix merge error. ...

The code removed by commit 421d9df062 ("net/macb: merge
at91_ether driver into macb driver") should be removed
in the merge resolution as well.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-03-10 18:33:49 -04:00

..

Kconfig

net/macb: merge at91_ether driver into macb driver

2015-03-07 22:31:37 -05:00

macb.c

macb: Fix merge error.

2015-03-10 18:33:49 -04:00

macb.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-09 23:38:02 -04:00

Makefile

net/macb: merge at91_ether driver into macb driver

2015-03-07 22:31:37 -05:00