From 851902e14065935efad15684336b431cb65c85f1 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 9 Jan 2012 23:59:19 +0000
Subject: [PATCH] --- yaml --- r: 284296 b: refs/heads/master c:
 09ef0789bbceb0fe89ce4ad2bb1fdb2b937d3eba h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4b4c41a730f1..ec7d3207f076 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 859ad35e711d95f2794ab2196aac7c45fe5f7cfe
+refs/heads/master: 09ef0789bbceb0fe89ce4ad2bb1fdb2b937d3eba
diff --git a/trunk/drivers/net/ethernet/smsc/smsc911x.c b/trunk/drivers/net/ethernet/smsc/smsc911x.c
index 9d0b8ced0234..24d2df068d71 100644
--- a/trunk/drivers/net/ethernet/smsc/smsc911x.c
+++ b/trunk/drivers/net/ethernet/smsc/smsc911x.c
@@ -1044,7 +1044,8 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,
 	}
 
 	pdata->mii_bus->name = SMSC_MDIONAME;
-	snprintf(pdata->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+	snprintf(pdata->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		pdev->name, pdev->id);
 	pdata->mii_bus->priv = pdata;
 	pdata->mii_bus->read = smsc911x_mii_read;
 	pdata->mii_bus->write = smsc911x_mii_write;