]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ec320d) | patch
macb: Fix merge error.
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Mar 2015 22:33:49 +0000 (18:33 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 22:33:49 +0000 (18:33 -0400)
commit416377ea392823e8ea1f8a10477e7d08a9bb715e
treef68c4ea48f6a1f2a1355fa479b9b154f2b59242dtree | snapshot
parent3ec320dd5c9465fbed3c84dd14ed3941ce757823commit | 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>
drivers/net/ethernet/cadence/macb.c diff | blob | history
Linux kernel for KaRo TX COM modules