From 72ce19875895928433fa4332783a9792c2bf1037 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 28 Apr 2009 02:11:53 -0700
Subject: [PATCH] --- yaml --- r: 150051 b: refs/heads/master c:
 8555a5948467e941acc34e8b1c30df4c1f2f5862 h: refs/heads/master i:   150049:
 b437f5e3f016b8d3b6c096827137986cb059bca7   150047:
 f5d90eda764cd00d4cc6500c7c5e5509bd0de822 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/ucc_geth.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a4c5c8f6e74b..3c68437ba442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d58ea30b141c95bd21fb39021d4b602f48b30be
+refs/heads/master: 8555a5948467e941acc34e8b1c30df4c1f2f5862
diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c
index a53628466637..f18017dc0255 100644
--- a/trunk/drivers/net/ucc_geth.c
+++ b/trunk/drivers/net/ucc_geth.c
@@ -3631,9 +3631,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 	prop = of_get_property(np, "phy-connection-type", NULL);
 	if (!prop) {
 		/* handle interface property present in old trees */
-		if (!phy)
-			return -ENODEV;
-
 		prop = of_get_property(phy, "interface", NULL);
 		if (prop != NULL) {
 			phy_interface = enet_to_phy_interface[*prop];