---

yaml --- r: 284287 b: refs/heads/master c: 446bbc4 h: refs/heads/master i: 284285: c1c9ed2 284283: 01d2f0a 284279: 88d05a4 284271: c1ec9a2 284255: 6a9b843 284223: 6a08649 284159: d8b34dc v: v3
git-mirror · Jan 11, 2012 · 9585608 · 9585608
1 parent a5a23f4
commit 9585608
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f74299b6c1d01363adf356c9ecc01ba000a5a1aa
+refs/heads/master: 446bbc4b5ee122c3a3a4954b144d031f0f9aa006
diff --git a/trunk/drivers/net/ethernet/broadcom/sb1250-mac.c b/trunk/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2259,7 +2259,8 @@ static int sbmac_init(struct platform_device *pldev, long long base)
 	}
 
 	sc->mii_bus->name = sbmac_mdio_string;
-	snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
+	snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		pldev->name, idx);
 	sc->mii_bus->priv = sc;
 	sc->mii_bus->read = sbmac_mii_read;
 	sc->mii_bus->write = sbmac_mii_write;