aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2009-04-28 05:11:53 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-28 05:11:53 -0400
commit8555a5948467e941acc34e8b1c30df4c1f2f5862 (patch)
tree7e4c071c1265ecd7061033ddce6fb327936eff84 /drivers/net
parent1d58ea30b141c95bd21fb39021d4b602f48b30be (diff)
net: Fix ucc_geth.c handling of fixed-link w/o phy-connection-type property.
Previous rework to ucc_geth.c to add of_mdio support (net: Rework ucc_geth driver to use of_mdio infrastructure) added a block of code which broke older openfirmware device trees which this case. This patch removes the offending blurb. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ucc_geth.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index a5362846663..f18017dc025 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3631,9 +3631,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
3631 prop = of_get_property(np, "phy-connection-type", NULL); 3631 prop = of_get_property(np, "phy-connection-type", NULL);
3632 if (!prop) { 3632 if (!prop) {
3633 /* handle interface property present in old trees */ 3633 /* handle interface property present in old trees */
3634 if (!phy)
3635 return -ENODEV;
3636
3637 prop = of_get_property(phy, "interface", NULL); 3634 prop = of_get_property(phy, "interface", NULL);
3638 if (prop != NULL) { 3635 if (prop != NULL) {
3639 phy_interface = enet_to_phy_interface[*prop]; 3636 phy_interface = enet_to_phy_interface[*prop];