diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/net/fec.c | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
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 ea23baaf0256..fe2650237e34 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1675,7 +1675,7 @@ static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_priva | |||
| 1675 | /* | 1675 | /* |
| 1676 | * Set MII speed to 2.5 MHz | 1676 | * Set MII speed to 2.5 MHz |
| 1677 | */ | 1677 | */ |
| 1678 | fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2; | 1678 | fep->phy_speed = (MCF_CLK / 3) / (2500000 * 2 ) * 2; |
| 1679 | fecp->fec_mii_speed = fep->phy_speed; | 1679 | fecp->fec_mii_speed = fep->phy_speed; |
| 1680 | 1680 | ||
| 1681 | fec_restart(dev, 0); | 1681 | fec_restart(dev, 0); |