Browse Source

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

David S. Miller 14 years ago
parent
commit
29e1846a6b
2 changed files with 297 additions and 298 deletions
  1. 2 1
      drivers/net/Kconfig
  2. 295 297
      drivers/net/fec.c

+ 2 - 1
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

File diff suppressed because it is too large
+ 295 - 297
drivers/net/fec.c


Some files were not shown because too many files changed in this diff