diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/net/ucc_geth_phy.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/net/ucc_geth_phy.c')
| -rw-r--r-- | drivers/net/ucc_geth_phy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index 3c86592ce03c..6fda6d88be49 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c | |||
| @@ -376,6 +376,8 @@ static int marvell_init(struct ugeth_mii_info *mii_info) | |||
| 376 | ugphy_vdbg("%s: IN", __FUNCTION__); | 376 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 377 | 377 | ||
| 378 | ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); | 378 | ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); |
| 379 | ucc_geth_phy_write(mii_info, 0x1b, | ||
| 380 | (ucc_geth_phy_read(mii_info, 0x1b) & ~0x000f) | 0x000b); | ||
| 379 | ucc_geth_phy_write(mii_info, MII_BMCR, | 381 | ucc_geth_phy_write(mii_info, MII_BMCR, |
| 380 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); | 382 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); |
| 381 | msleep(4000); | 383 | msleep(4000); |