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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0ec01e42e9b1..49f4d50abc56 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1828,8 +1828,8 @@ config 68360_ENET | |||
| 1828 | the Motorola 68360 processor. | 1828 | the Motorola 68360 processor. |
| 1829 | 1829 | ||
| 1830 | config FEC | 1830 | config FEC |
| 1831 | bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" | 1831 | bool "FEC ethernet controller (of ColdFire CPUs)" |
| 1832 | depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27 | 1832 | depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 |
| 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 and Freescale i.MX processors. | 1835 | controller on some Motorola ColdFire and Freescale i.MX processors. |