From 6992daa4fbaba09995c1fc01a09187ede5420204 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 9 Jan 2012 23:59:07 +0000
Subject: [PATCH] --- yaml --- r: 284284 b: refs/heads/master c:
 fa84e7201c592945b390fb51a5ffc7e785868be4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6303a1af3ac9..257817a04eb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71bc5d94061516c4e70303570128797bcf768b10
+refs/heads/master: fa84e7201c592945b390fb51a5ffc7e785868be4
diff --git a/trunk/drivers/net/ethernet/8390/ax88796.c b/trunk/drivers/net/ethernet/8390/ax88796.c
index 9e8ba4f5636b..0f92e3567f68 100644
--- a/trunk/drivers/net/ethernet/8390/ax88796.c
+++ b/trunk/drivers/net/ethernet/8390/ax88796.c
@@ -623,7 +623,8 @@ static int ax_mii_init(struct net_device *dev)
 
 	ax->mii_bus->name = "ax88796_mii_bus";
 	ax->mii_bus->parent = dev->dev.parent;
-	snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+	snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+		pdev->name, pdev->id);
 
 	ax->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
 	if (!ax->mii_bus->irq) {