diff --git a/[refs] b/[refs]
index 6b12ed24c8e9..ae4f1eee409e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e53c7f954a1e616df74723630dc844c211f6be5
+refs/heads/master: 21a8cfe120c581091722fb146540a2033af16a57
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index af305c0b34d1..cfb4198b6776 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -202,7 +202,7 @@ struct cpmac_priv {
 	void __iomem *regs;
 	struct mii_bus *mii_bus;
 	struct phy_device *phy;
-	char phy_name[BUS_ID_SIZE];
+	char phy_name[MII_BUS_ID_SIZE + 3];
 	int oldlink, oldspeed, oldduplex;
 	u32 msg_enable;
 	struct net_device *dev;