---

yaml --- r: 35176 b: refs/heads/master c: 600c977 h: refs/heads/master v: v3
git-mirror · Aug 16, 2006 · f2d3d43 · f2d3d43
1 parent 49f9293
commit f2d3d43
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7820d4281a0d746a92992a9117aec007628ae3fe
+refs/heads/master: 600c977c0801210602d7502f9c978c2b8c31a209
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -1498,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter *adapter)
 	} else if (hw->mac_type == e1000_80003es2lan) {
 		tarc = E1000_READ_REG(hw, TARC0);
 		tarc |= 1;
-		if (hw->media_type == e1000_media_type_internal_serdes)
-			tarc |= (1 << 20);
 		E1000_WRITE_REG(hw, TARC0, tarc);
 		tarc = E1000_READ_REG(hw, TARC1);
 		tarc |= 1;