aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-09 23:59:11 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-10 16:35:00 -0800
commit98d5e57eafce7a68d864fdb5a26542ba8b4f59ba (patch)
tree9800df483050169adb3d4ea3aea2b79969ee9399 /drivers/net/ethernet
parentsb1250: use an unique MDIO bus name. (diff)
downloadlinux-dev-98d5e57eafce7a68d864fdb5a26542ba8b4f59ba.tar.xz
linux-dev-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')
-rw-r--r--drivers/net/ethernet/cadence/macb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index f3d5c65d99cf..23200680d4c1 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;