From 9585608ae40598dd4a4a5d3f9be7a6103cdd25b9 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 9 Jan 2012 23:59:10 +0000
Subject: [PATCH] --- yaml --- r: 284287 b: refs/heads/master c:
 446bbc4b5ee122c3a3a4954b144d031f0f9aa006 h: refs/heads/master i:   284285:
 c1c9ed283c6d3b30955c3924c205cd330d2d754e   284283:
 01d2f0a79a306e049f172eb43bde32de1ad46c5d   284279:
 88d05a4622347da42f1b913e8b4d66cbf5e0482f   284271:
 c1ec9a2ae726309e4f97e5ffa69202a080bd208b   284255:
 6a9b843ee2431eb07c2cf108c3f48150f9d1e24f   284223:
 6a08649ccedcfcb6bbd2c2958d76e1ebdf7eef04   284159:
 d8b34dc704098fa935450b072c775358b98c65e6 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/broadcom/sb1250-mac.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6d2fc2bed4a..a0e3574c2100 100644
--- 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
index 8fa7abc53ec6..084904ceaa30 100644
--- 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;