---

yaml --- r: 231920 b: refs/heads/master c: f966a13 h: refs/heads/master v: v3
git-mirror · Jan 18, 2011 · 58efc62 · 58efc62
1 parent c134d0b
commit 58efc62
Show file tree

Hide file tree

Showing 116 changed files with 1,328 additions and 1,042 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38d59392b29437af3a702209b6a5196ef01f79a8
+refs/heads/master: f966a13f92913ce8cbd35bc7f066553c9f3d41b0
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1950,14 +1950,6 @@ config FEC
 	  Say Y here if you want to use the built-in 10/100 Fast ethernet
 	  controller on some Motorola ColdFire and Freescale i.MX processors.
 
-config FEC2
-	bool "Second FEC ethernet controller"
-	depends on FEC
-	help
-	  Say Y here if you want to use the second built-in 10/100 Fast
-	  ethernet controller on some Motorola ColdFire and Freescale
-	  i.MX processors.
-
 config FEC_MPC52xx
 	tristate "MPC52xx FEC driver"
 	depends on PPC_MPC52xx && PPC_BESTCOMM