---

yaml --- r: 284299 b: refs/heads/master c: 5a05a82 h: refs/heads/master i: 284297: a4f41cf 284295: fec05e9 v: v3
git-mirror · Jan 11, 2012 · acf5d35 · acf5d35
1 parent 8f70879
commit acf5d35
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: 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
@@ -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)) {