Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index c83bd6560088..42d94edeee26 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1178,8 +1178,15 @@ static int __devinit find_phy(struct device_node *np,
         struct device_node *phynode, *mdionode;
         struct resource res;
         int ret = 0, len;
+        const u32 *data;
+
+        data  = of_get_property(np, "fixed-link", NULL);
+        if (data) {
+                snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
+                return 0;
+        }
 
-        const u32 *data = of_get_property(np, "phy-handle", &len);
+        data = of_get_property(np, "phy-handle", &len);
         if (!data || len != 4)
                 return -EINVAL;