---

yaml --- r: 143951 b: refs/heads/master c: cef309c h: refs/heads/master i: 143949: 9da98c4 143947: ef3ec04 143943: 83f4a16 143935: bab4882 v: v3
git-mirror · Apr 22, 2009 · e11fd56 · e11fd56
1 parent ed0112d
commit e11fd56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9738f73ad08ef770df64f145007bd27ac2fa16
+refs/heads/master: cef309cf6112f9a44b1ebcefc1641d01d35c83dc
diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c
@@ -1394,7 +1394,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
 	    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
-		upsmr |= UCC_GETH_UPSMR_RPM;
+		if (ugeth->phy_interface != PHY_INTERFACE_MODE_RMII)
+			upsmr |= UCC_GETH_UPSMR_RPM;
 		switch (ugeth->max_speed) {
 		case SPEED_10:
 			upsmr |= UCC_GETH_UPSMR_R10M;