aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-09 18:59:22 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-10 19:35:01 -0500
commit5a05a8200a4359ef2bfe9094c137dee35cfdd516 (patch)
tree398018bc13ea0295781219bd0e40705ff9c2d372 /drivers/net
parentd1733f078b1b3777fed8e8fe598e7f10f28f59fb (diff)
davinci_emac: use an unique MDIO bus name.
Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/ti/davinci_mdio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 7615040df756..ef7c9c17bfff 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -313,7 +313,8 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
313 data->bus->reset = davinci_mdio_reset, 313 data->bus->reset = davinci_mdio_reset,
314 data->bus->parent = dev; 314 data->bus->parent = dev;
315 data->bus->priv = data; 315 data->bus->priv = data;
316 snprintf(data->bus->id, MII_BUS_ID_SIZE, "%x", pdev->id); 316 snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s-%x",
317 pdev->name, pdev->id);
317 318
318 data->clk = clk_get(dev, NULL); 319 data->clk = clk_get(dev, NULL);
319 if (IS_ERR(data->clk)) { 320 if (IS_ERR(data->clk)) {