From fec05e9a9c2c5bc9d565635049b2edf4a98b0e20 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 9 Jan 2012 23:59:18 +0000
Subject: [PATCH] --- yaml --- r: 284295 b: refs/heads/master c:
 859ad35e711d95f2794ab2196aac7c45fe5f7cfe h: refs/heads/master i:   284293:
 36e5f42c78655cee0cc4abc63847ad944aba4958   284291:
 477885391f4ab2e94b3d2974cb0bc8de943f4a6d   284287:
 9585608ae40598dd4a4a5d3f9be7a6103cdd25b9 v: v3

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

diff --git a/[refs] b/[refs]
index e9909799fcb1..4b4c41a730f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5278fb547076ad6768d16c8b4df45c086470c163
+refs/heads/master: 859ad35e711d95f2794ab2196aac7c45fe5f7cfe
diff --git a/trunk/drivers/net/ethernet/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c
index a7ff8ea342b4..22e9c0181ce8 100644
--- a/trunk/drivers/net/ethernet/s6gmac.c
+++ b/trunk/drivers/net/ethernet/s6gmac.c
@@ -1004,7 +1004,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
 	mb->write = s6mii_write;
 	mb->reset = s6mii_reset;
 	mb->priv = pd;
-	snprintf(mb->id, MII_BUS_ID_SIZE, "0");
+	snprintf(mb->id, MII_BUS_ID_SIZE, "%s-%x", pdev->name, pdev->id);
 	mb->phy_mask = ~(1 << 0);
 	mb->irq = &pd->mii.irq[0];
 	for (i = 0; i < PHY_MAX_ADDR; i++) {