---

yaml --- r: 284295 b: refs/heads/master c: 859ad35 h: refs/heads/master i: 284293: 36e5f42 284291: 4778853 284287: 9585608 v: v3
git-mirror · Jan 11, 2012 · fec05e9 · fec05e9
1 parent d5e4062
commit fec05e9
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: 5278fb547076ad6768d16c8b4df45c086470c163
+refs/heads/master: 859ad35e711d95f2794ab2196aac7c45fe5f7cfe
diff --git a/trunk/drivers/net/ethernet/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c
@@ -1004,7 +1004,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
 	mb->write = s6mii_write;
 	mb->reset = s6mii_reset;
 	mb->priv = pd;
-	snprintf(mb->id, MII_BUS_ID_SIZE, "0");
+	snprintf(mb->id, MII_BUS_ID_SIZE, "%s-%x", pdev->name, pdev->id);
 	mb->phy_mask = ~(1 << 0);
 	mb->irq = &pd->mii.irq[0];
 	for (i = 0; i < PHY_MAX_ADDR; i++) {