From 87cc52aa6ddb772be11ff8beb868c43d2af45899 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 4 Jan 2012 08:50:40 +0000
Subject: [PATCH] --- yaml --- r: 279415 b: refs/heads/master c:
 817380e1d05534880a99d84a47cc5a2df111030d h: refs/heads/master i:   279413:
 01e2243f4b32fadc7f132cb3349be2ed49521193   279411:
 954bb890a16d82e4a975e1be429df6dd88a9e562   279407:
 71a977557b202eaf174a18061235933d6806f585 v: v3

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

diff --git a/[refs] b/[refs]
index ba62beb6a7e5..b821b9e7a09c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6bff995f8fe78f74cbe8f14bf6a31f3560b9ce4
+refs/heads/master: 817380e1d05534880a99d84a47cc5a2df111030d
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
index 4bf68cfef390..a63b23fa6f20 100644
--- a/trunk/drivers/net/ethernet/rdc/r6040.c
+++ b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -1188,7 +1188,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 	lp->mii_bus->write = r6040_mdiobus_write;
 	lp->mii_bus->reset = r6040_mdiobus_reset;
 	lp->mii_bus->name = "r6040_eth_mii";
-	snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x", card_idx);
+	snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		dev_name(&pdev->dev), card_idx);
 	lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
 	if (!lp->mii_bus->irq) {
 		dev_err(&pdev->dev, "mii_bus irq allocation failed\n");