diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index ea63cb085d19..676ffe093180 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c | |||
@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) | |||
1412 | /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ | 1412 | /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ |
1413 | static int bgmac_probe(struct bcma_device *core) | 1413 | static int bgmac_probe(struct bcma_device *core) |
1414 | { | 1414 | { |
1415 | struct bcma_chipinfo *ci = &core->bus->chipinfo; | ||
1415 | struct net_device *net_dev; | 1416 | struct net_device *net_dev; |
1416 | struct bgmac *bgmac; | 1417 | struct bgmac *bgmac; |
1417 | struct ssb_sprom *sprom = &core->bus->sprom; | 1418 | struct ssb_sprom *sprom = &core->bus->sprom; |
@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) | |||
1474 | bgmac_chip_reset(bgmac); | 1475 | bgmac_chip_reset(bgmac); |
1475 | 1476 | ||
1476 | /* For Northstar, we have to take all GMAC core out of reset */ | 1477 | /* For Northstar, we have to take all GMAC core out of reset */ |
1477 | if (core->id.id == BCMA_CHIP_ID_BCM4707 || | 1478 | if (ci->id == BCMA_CHIP_ID_BCM4707 || |
1478 | core->id.id == BCMA_CHIP_ID_BCM53018) { | 1479 | ci->id == BCMA_CHIP_ID_BCM53018) { |
1479 | struct bcma_device *ns_core; | 1480 | struct bcma_device *ns_core; |
1480 | int ns_gmac; | 1481 | int ns_gmac; |
1481 | 1482 | ||