From 94c65292c3b125862d2fc39591e6e0bc249336d6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 17 Nov 2009 04:46:18 -0800
Subject: [PATCH] --- yaml --- r: 168762 b: refs/heads/master c:
 e54d5512b600aa0d492010436ff7eb0c9194efc1 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/sungem.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3d027d51e5df..4ed90bc6f06a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99b4a02848afe7fae960884dfa6e7a88f545f09
+refs/heads/master: e54d5512b600aa0d492010436ff7eb0c9194efc1
diff --git a/trunk/drivers/net/sungem.c b/trunk/drivers/net/sungem.c
index 305ec3d783db..1927b3de9eec 100644
--- a/trunk/drivers/net/sungem.c
+++ b/trunk/drivers/net/sungem.c
@@ -2062,7 +2062,15 @@ static int gem_check_invariants(struct gem *gp)
 		mif_cfg &= ~MIF_CFG_PSELECT;
 		writel(mif_cfg, gp->regs + MIF_CFG);
 	} else {
-		gp->phy_type = phy_serialink;
+#ifdef CONFIG_SPARC
+		const char *p;
+
+		p = of_get_property(gp->of_node, "shared-pins", NULL);
+		if (p && !strcmp(p, "serdes"))
+			gp->phy_type = phy_serdes;
+		else
+#endif
+			gp->phy_type = phy_serialink;
 	}
 	if (gp->phy_type == phy_mii_mdio1 ||
 	    gp->phy_type == phy_mii_mdio0) {