---

yaml --- r: 284298 b: refs/heads/master c: d1733f0 h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · 8f70879 · 8f70879
1 parent a4f41cf
commit 8f70879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db8857bf5bd888d763e1984f9449d0b824b39ee1
+refs/heads/master: d1733f078b1b3777fed8e8fe598e7f10f28f59fb
diff --git a/trunk/drivers/net/ethernet/ti/cpmac.c b/trunk/drivers/net/ethernet/ti/cpmac.c
@@ -1269,7 +1269,7 @@ int __devinit cpmac_init(void)
 	}
 
 	cpmac_mii->phy_mask = ~(mask | 0x80000000);
-	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
+	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1");
 
 	res = mdiobus_register(cpmac_mii);
 	if (res)