diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-23 04:08:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-23 04:08:24 -0700 |
| commit | 5802b140ed52957ad150eaf40239a95f5f45fbd3 (patch) | |
| tree | e5c37962611bc5f39c56a1ec479b9059072f056a /drivers/net/ucc_geth.c | |
| parent | 09488e2e0fab14ebe41135f0d066cfe2c56ba9e5 (diff) | |
| parent | 29fe1b481283a1bada994a69f65736db4ae6f35f (diff) | |
| download | linux-5802b140ed52957ad150eaf40239a95f5f45fbd3.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/iucv/af_iucv.c
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 98f961e92ca9..811f97cb0a29 100644 --- a/drivers/net/ucc_geth.c +++ b/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; |