Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
authorKenth Eriksson <kenth.eriksson@transmode.com>
Tue, 27 Mar 2012 22:05:54 +0000 (22:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Apr 2012 20:47:12 +0000 (16:47 -0400)
commit464b57da56910c8737ede75ad820b9a7afc46b3e
tree0d5ec220c1dbe97b9fdfe4f6bd0e748cddf191a7
parent67378563df2e168d32a4054616f244a91aec462d
Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

The merge done in commit b26e478f undid bug fix in commit c3e072f8
("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non
TBI (e.g. MDIO) PHYs cannot be accessed.

Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fsl_pq_mdio.c