| commit | 416377ea392823e8ea1f8a10477e7d08a9bb715e | [log] [tgz] |
|---|---|---|
| author | Stephen Rothwell <sfr@canb.auug.org.au> | Tue Mar 10 18:33:49 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 10 18:33:49 2015 -0400 |
| tree | f68c4ea48f6a1f2a1355fa479b9b154f2b59242d | |
| parent | 3ec320dd5c9465fbed3c84dd14ed3941ce757823 [diff] |
macb: Fix merge error.
The code removed by commit 421d9df0628b ("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>