---

yaml --- r: 150613 b: refs/heads/master c: 32d0c1e h: refs/heads/master i: 150611: 10bef78 v: v3
git-mirror · Jun 3, 2009 · 270a066 · 270a066
1 parent 9dbe0de
commit 270a066
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5b9215ef9a274eb9fb65f6aa4602ad82d10a6cb
+refs/heads/master: 32d0c1e1bee16781e94c7ea8c75499696bce0a33
diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c
@@ -243,6 +243,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
 
 		temp &= ~(MII_M1111_HWCFG_MODE_MASK);
 		temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK;
+		temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
 
 		err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
 		if (err < 0)