From: David S. Miller <davem@davemloft.net>
Date: Wed, 27 May 2009 04:10:22 +0000 (-0700)
Subject: cpmac: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE.
X-Git-Tag: v2.6.31-rc1~330^2~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21a8cfe120c581091722fb146540a2033af16a57;p=thirdparty%2Fkernel%2Flinux.git

cpmac: Remove references to BUS_ID_SIZE, use MII_BUS_ID_SIZE.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index af305c0b34d1a..cfb4198b6776c 100644
--- a/drivers/net/cpmac.c
+++ b/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;