Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e1846a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6

parents f39925db cd1f402c

drivers/net/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1944,7 +1944,8 @@ config 68360_ENET 
config FEC

	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

	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

	help

	  Say Y here if you want to use the built-in 10/100 Fast ethernet

drivers/net/fec.c

+326 −324

File changed.

Preview size limit exceeded, changes collapsed.