---

yaml --- r: 56550 b: refs/heads/master c: dbf2e85 h: refs/heads/master v: v3
git-mirror · May 18, 2007 · 5b0530e · 5b0530e
1 parent 94df69b
commit 5b0530e
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: 5bb96e9f2434b49a5b8f135f2a384974aa73db51
+refs/heads/master: dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3
diff --git a/trunk/drivers/net/ibm_emac/ibm_emac_core.c b/trunk/drivers/net/ibm_emac/ibm_emac_core.c
@@ -926,7 +926,7 @@ static int emac_link_differs(struct ocp_enet_private *dev)
 	int duplex = r & EMAC_MR1_FDE ? DUPLEX_FULL : DUPLEX_HALF;
 	int speed, pause, asym_pause;
 
-	if (r & (EMAC_MR1_MF_1000 | EMAC_MR1_MF_1000GPCS))
+	if (r & EMAC_MR1_MF_1000)
 		speed = SPEED_1000;
 	else if (r & EMAC_MR1_MF_100)
 		speed = SPEED_100;