From e65471952a9135420e774ee1a2f9d9e54294638e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 26 May 2009 21:16:25 -0700
Subject: [PATCH] --- yaml --- r: 150511 b: refs/heads/master c:
 8e401eccd3a62fb57f117bb09b7c1fc70ab19e8c h: refs/heads/master i:   150509:
 0b790d4c0cf470f765b7af395d3a82291eb2c9fe   150507:
 9ec61f182835393fc46a140bee5f5b0d42670ee7   150503:
 7b56ac45f80ecff1e445c82f59d3c14cf7512888   150495:
 ced861d5da8bf6a6f0242732c6c60892ca90d919 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/phy.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 96e48c6b2817..b791561c1106 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 079e24ed80c8a91dd2884b88820bac6f340aaa83
+refs/heads/master: 8e401eccd3a62fb57f117bb09b7c1fc70ab19e8c
diff --git a/trunk/include/linux/phy.h b/trunk/include/linux/phy.h
index c216e4e503b3..b1368b8f6572 100644
--- a/trunk/include/linux/phy.h
+++ b/trunk/include/linux/phy.h
@@ -79,7 +79,7 @@ typedef enum {
  * Need to be a little smaller than phydev->dev.bus_id to leave room
  * for the ":%02x"
  */
-#define MII_BUS_ID_SIZE	(BUS_ID_SIZE - 3)
+#define MII_BUS_ID_SIZE	(20 - 3)
 
 /*
  * The Bus class for PHYs.  Devices which provide access to
@@ -407,7 +407,7 @@ struct phy_driver {
 /* A Structure for boards to register fixups with the PHY Lib */
 struct phy_fixup {
 	struct list_head list;
-	char bus_id[BUS_ID_SIZE];
+	char bus_id[20];
 	u32 phy_uid;
 	u32 phy_uid_mask;
 	int (*run)(struct phy_device *phydev);