Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd6d5fa authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 7937963a e47ad65b

drivers/net/ethernet/freescale/fs_enet/mac-fec.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -363,7 +363,7 @@ static void stop(struct net_device *dev) 
	const struct fs_platform_info *fpi = fep->fpi;

	const struct fs_platform_info *fpi = fep->fpi;

	struct fec __iomem *fecp = fep->fec.fecp;

	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;

	int i;

drivers/net/ethernet/freescale/ucc_geth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1716,7 +1716,7 @@ static void uec_configure_serdes(struct net_device *dev) 




	phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS);

	phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS);





	put_device(&tbiphy->dev);

	put_device(&tbiphy->mdio.dev);

}

}





/* Configure the PHY for dev.

/* Configure the PHY for dev.