From 419a16e7cb7c04b83f8ab8bd4d2fb220af73579e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 9 Jan 2012 23:59:24 +0000 Subject: [PATCH] --- yaml --- r: 284301 b: refs/heads/master c: 3e617506c17df5cba55d7c615ec7cfbc812ec5fa h: refs/heads/master i: 284299: acf5d35e0c35d06b49d33bd20bbd0f040ef8569a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0094d5688f3..7c3f8b84aaad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0869b3a456d62070fb1f7e3519fd53934b52530c +refs/heads/master: 3e617506c17df5cba55d7c615ec7cfbc812ec5fa diff --git a/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c index d44331eb07fe..986019b2c849 100644 --- a/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1727,7 +1727,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev) bus->priv = priv; bus->read = bcm_enet_mdio_read_phylib; bus->write = bcm_enet_mdio_write_phylib; - sprintf(bus->id, "%d", priv->mac_id); + sprintf(bus->id, "%s-%d", pdev->name, priv->mac_id); /* only probe bus where we think the PHY is, because * the mdio read operation return 0 instead of 0xffff