From acf5d35e0c35d06b49d33bd20bbd0f040ef8569a Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 9 Jan 2012 23:59:22 +0000
Subject: [PATCH] --- yaml --- r: 284299 b: refs/heads/master c:
 5a05a8200a4359ef2bfe9094c137dee35cfdd516 h: refs/heads/master i:   284297:
 a4f41cffa96d298b37752fbb4cf3e60efdaccac6   284295:
 fec05e9a9c2c5bc9d565635049b2edf4a98b0e20 v: v3

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

diff --git a/[refs] b/[refs]
index 1c6e7d0c7901..2ec60ce1ec35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1733f078b1b3777fed8e8fe598e7f10f28f59fb
+refs/heads/master: 5a05a8200a4359ef2bfe9094c137dee35cfdd516
diff --git a/trunk/drivers/net/ethernet/ti/davinci_mdio.c b/trunk/drivers/net/ethernet/ti/davinci_mdio.c
index 7615040df756..ef7c9c17bfff 100644
--- a/trunk/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/trunk/drivers/net/ethernet/ti/davinci_mdio.c
@@ -313,7 +313,8 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
 	data->bus->reset	= davinci_mdio_reset,
 	data->bus->parent	= dev;
 	data->bus->priv		= data;
-	snprintf(data->bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+	snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		pdev->name, pdev->id);
 
 	data->clk = clk_get(dev, NULL);
 	if (IS_ERR(data->clk)) {