diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-10 23:33:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 23:33:49 +0100 |
| commit | 416377ea392823e8ea1f8a10477e7d08a9bb715e (patch) | |
| tree | f68c4ea48f6a1f2a1355fa479b9b154f2b59242d | |
| parent | fib_trie: Correctly handle case of key == 0 in leaf_walk_rcu (diff) | |
| download | linux-416377ea392823e8ea1f8a10477e7d08a9bb715e.tar.xz linux-416377ea392823e8ea1f8a10477e7d08a9bb715e.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index f032e2a245b0..f00be585f661 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2131,24 +2131,8 @@ static const struct net_device_ops macb_netdev_ops = { */ static void macb_configure_caps(struct macb *bp) { - const struct of_device_id *match; - const struct macb_config *config; u32 dcfg; - if (bp->pdev->dev.of_node) { - match = of_match_node(macb_dt_ids, bp->pdev->dev.of_node); - if (match && match->data) { - config = match->data; - - bp->caps = config->caps; - /* - * As we have access to the matching node, configure - * DMA burst length as well - */ - bp->dma_burst_length = config->dma_burst_length; - } - } - if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2) bp->caps |= MACB_CAPS_MACB_IS_GEM; |