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

29e1846a · David S. Miller · f39925db · cd1f402c · 29e1846a · 29e1846a
Commit 29e1846a authored Feb 15, 2011 by David S. Miller
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 328 additions and 325 deletions

drivers/net/Kconfig drivers/net/Kconfig +2 -1

drivers/net/fec.c drivers/net/fec.c +326 -324

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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

--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c