diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-01 12:53:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-01 12:53:26 -0500 |
| commit | de8696203e64f19ea26f8e096ac8a796e78216b3 (patch) | |
| tree | d932f2f04d6c81c75c5104ae86b1e5d47e6591e3 /drivers/net | |
| parent | 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f (diff) | |
| parent | 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/fec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9fe8cb7d43ac..6bdfd47d679d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1829,7 +1829,7 @@ config 68360_ENET | |||
| 1829 | 1829 | ||
| 1830 | config FEC | 1830 | config FEC |
| 1831 | bool "FEC ethernet controller (of ColdFire CPUs)" | 1831 | bool "FEC ethernet controller (of ColdFire CPUs)" |
| 1832 | depends on M523x || M527x || M5272 || M528x || M520x | 1832 | depends on M523x || M527x || M5272 || M528x || M520x || M532x |
| 1833 | help | 1833 | help |
| 1834 | Say Y here if you want to use the built-in 10/100 Fast ethernet | 1834 | Say Y here if you want to use the built-in 10/100 Fast ethernet |
| 1835 | controller on some Motorola ColdFire processors. | 1835 | controller on some Motorola ColdFire processors. |
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); |