diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /drivers/net/Kconfig | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 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. |