Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
This commit is contained in:
@@ -1944,7 +1944,8 @@ config 68360_ENET
|
|||||||
config FEC
|
config FEC
|
||||||
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
|
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
|
||||||
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
|
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
|
||||||
MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
|
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
|
||||||
|
default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
|
||||||
select PHYLIB
|
select PHYLIB
|
||||||
help
|
help
|
||||||
Say Y here if you want to use the built-in 10/100 Fast ethernet
|
Say Y here if you want to use the built-in 10/100 Fast ethernet
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user