---

yaml --- r: 284301 b: refs/heads/master c: 3e61750 h: refs/heads/master i: 284299: acf5d35 v: v3
git-mirror · Jan 11, 2012 · 419a16e · 419a16e
1 parent 1ac7828
commit 419a16e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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