diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /drivers/net/fec.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 7e33c129d51c..2769083bfe83 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1698,7 +1698,7 @@ static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_priva | |||
| 1698 | /* | 1698 | /* |
| 1699 | * Set MII speed to 2.5 MHz | 1699 | * Set MII speed to 2.5 MHz |
| 1700 | */ | 1700 | */ |
| 1701 | fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2; | 1701 | fep->phy_speed = (MCF_CLK / 3) / (2500000 * 2 ) * 2; |
| 1702 | fecp->fec_mii_speed = fep->phy_speed; | 1702 | fecp->fec_mii_speed = fep->phy_speed; |
| 1703 | 1703 | ||
| 1704 | fec_restart(dev, 0); | 1704 | fec_restart(dev, 0); |