From: Kenth Eriksson <kenth.eriksson@transmode.com>
Date: Tue, 27 Mar 2012 22:05:54 +0000 (+0000)
Subject: Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
X-Git-Tag: v3.2.15~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127241bd9ae2771020b24c4537ee1219f823c45f;p=pandora-kernel.git

Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

[ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed