diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 09:37:02 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 09:37:02 +0200 |
commit | ba13dc4776cfd2bd9bb32817b6d815119ec86a14 (patch) | |
tree | 1e41608b9f8a922ff3ed633149703a2ce818eed8 /drivers/net/fec_imx.c | |
parent | ddbbeee82214c5edcdeb7da0a1d480d1d32104d0 (diff) | |
parent | 79884012c66390845b977cd1cab2db1f9cd0a3b5 (diff) | |
download | barebox-ba13dc4776cfd2bd9bb32817b6d815119ec86a14.tar.gz barebox-ba13dc4776cfd2bd9bb32817b6d815119ec86a14.tar.xz |
Merge branch 'pu' into next
Diffstat (limited to 'drivers/net/fec_imx.c')
-rw-r--r-- | drivers/net/fec_imx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 8b4f439745..3b0f266a2b 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -612,6 +612,7 @@ static int fec_probe(struct device_d *dev) edev->halt = fec_halt; edev->get_ethaddr = fec_get_hwaddr; edev->set_ethaddr = fec_set_hwaddr; + edev->parent = dev; fec->regs = dev_request_mem_region(dev, 0); @@ -644,6 +645,7 @@ static int fec_probe(struct device_d *dev) fec->miidev.address = pdata->phy_addr; fec->miidev.flags = pdata->xcv_type == MII10 ? MIIDEV_FORCE_10 : 0; fec->miidev.edev = edev; + fec->miidev.parent = dev; mii_register(&fec->miidev); } |