diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-01-09 23:59:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-10 16:35:00 -0800 |
| commit | 98d5e57eafce7a68d864fdb5a26542ba8b4f59ba (patch) | |
| tree | 9800df483050169adb3d4ea3aea2b79969ee9399 /drivers/net/ethernet/cadence | |
| parent | 446bbc4b5ee122c3a3a4954b144d031f0f9aa006 (diff) | |
| download | linux-3.10-98d5e57eafce7a68d864fdb5a26542ba8b4f59ba.tar.gz linux-3.10-98d5e57eafce7a68d864fdb5a26542ba8b4f59ba.tar.bz2 linux-3.10-98d5e57eafce7a68d864fdb5a26542ba8b4f59ba.zip | |
macb: use an unique MDIO bus name.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index f3d5c65d99c..23200680d4c 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -243,7 +243,8 @@ static int macb_mii_init(struct macb *bp) bp->mii_bus->read = &macb_mdio_read; bp->mii_bus->write = &macb_mdio_write; bp->mii_bus->reset = &macb_mdio_reset; - snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%x", bp->pdev->id); + snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", + bp->pdev->name, bp->pdev->id); bp->mii_bus->priv = bp; bp->mii_bus->parent = &bp->dev->dev; pdata = bp->pdev->dev.platform_data; |