---

yaml --- r: 134967 b: refs/heads/master c: eb352b8 h: refs/heads/master i: 134965: c2d3ca3 134963: e55b585 134959: 01c8548 v: v3
git-mirror · Mar 2, 2009 · b2cd29b · b2cd29b
1 parent b3184ae
commit b2cd29b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc
+refs/heads/master: eb352b838d42e66f0267c40249798ffda3c63037
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
@@ -429,10 +429,9 @@ jme_check_link(struct net_device *netdev, int testonly)
 
 		jme->phylink = phylink;
 
-		ghc = jme->reg_ghc & ~(GHC_SPEED_10M |
-					GHC_SPEED_100M |
-					GHC_SPEED_1000M |
-					GHC_DPX);
+		ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX |
+				GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE |
+				GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY);
 		switch (phylink & PHY_LINK_SPEED_MASK) {
 		case PHY_LINK_SPEED_10M:
 			ghc |= GHC_SPEED_10M |