aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
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 /drivers/net/macb.c
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 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 84c77f1f9a5c..045361fe3d6a 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -250,7 +250,7 @@ static int macb_mii_init(struct macb *bp)
250 bp->mii_bus.reset = &macb_mdio_reset; 250 bp->mii_bus.reset = &macb_mdio_reset;
251 snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id); 251 snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id);
252 bp->mii_bus.priv = bp; 252 bp->mii_bus.priv = bp;
253 bp->mii_bus.dev = &bp->dev->dev; 253 bp->mii_bus.parent = &bp->dev->dev;
254 pdata = bp->pdev->dev.platform_data; 254 pdata = bp->pdev->dev.platform_data;
255 255
256 if (pdata) 256 if (pdata)