---

yaml --- r: 104918 b: refs/heads/master c: 9cf8fa4 h: refs/heads/master v: v3
git-mirror · Jul 22, 2008 · c9c5bcf · c9c5bcf
1 parent ae07bf0
commit c9c5bcf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e5a8c21bb9bb222917c36eba503ae88af52c34
+refs/heads/master: 9cf8fa4334e60f27b4a392f432c292f3af268215
diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c
@@ -162,7 +162,7 @@ static int m88e1111_config_init(struct phy_device *phydev)
 
 	/* Enable Fiber/Copper auto selection */
 	temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
-	temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+	temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
 	phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
 
 	temp = phy_read(phydev, MII_BMCR);