diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-12 04:27:26 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-12 04:27:26 (GMT) |
| commit | 6bd6d5fa71138ef624e11ee97503435f2961d4ea (patch) | |
| tree | cd2900aae48c4dca100fd2fe7959ea0d48eac37c | |
| parent | 7937963a02972281fd20c920db1a0344d947bb25 (diff) | |
| parent | e47ad65b1bcc5ede7fa2ae01619047585348563e (diff) | |
| download | linux-6bd6d5fa71138ef624e11ee97503435f2961d4ea.tar.xz | |
Merge branch 'mdio-build-failures'
Andrew Lunn says:
====================
More mdio device build failure fixes
These patches fix two build errors reported by Guenter Roeck
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/ucc_geth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c index c158d40..bade2f8 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c @@ -363,7 +363,7 @@ static void stop(struct net_device *dev) const struct fs_platform_info *fpi = fep->fpi; struct fec __iomem *fecp = fep->fec.fecp; - struct fec_info* feci= fep->phydev->bus->priv; + struct fec_info *feci = fep->phydev->mdio.bus->priv; int i; diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index 0e7f24e..cbddbe2 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -1716,7 +1716,7 @@ static void uec_configure_serdes(struct net_device *dev) phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS); - put_device(&tbiphy->dev); + put_device(&tbiphy->mdio.dev); } /* Configure the PHY for dev. |