mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
3ec320dd5c
commit
416377ea39
1 changed files with 0 additions and 16 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue