aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-10-01 11:41:33 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-08 19:27:49 -0400
commit18ee49ddb0d242ed1d0e273038d5e4f6de7379d3 (patch)
tree8d935cda154204171628cee535f83a992aa66ef9 /include/linux/phy.h
parent236bb5e649c2a7e8398b87df5e643368408afb4a (diff)
phylib: rename mii_bus::dev to mii_bus::parent
In preparation of giving mii_bus objects a device tree presence of their own, rename struct mii_bus's ->dev argument to ->parent, since having a 'struct device *dev' that points to our parent device conflicts with introducing a 'struct device dev' representing our own device. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 5f170f5b1a30..87499bdedc6f 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -99,7 +99,7 @@ struct mii_bus {
99 */ 99 */
100 struct mutex mdio_lock; 100 struct mutex mdio_lock;
101 101
102 struct device *dev; 102 struct device *parent;
103 103
104 /* list of all PHYs on bus */ 104 /* list of all PHYs on bus */
105 struct phy_device *phy_map[PHY_MAX_ADDR]; 105 struct phy_device *phy_map[PHY_MAX_ADDR];