Merge ../linux-2.6 by hand

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/fs_enet/Kconfig
new file mode 100644
index 000000000000..6aaee67dd4b7
--- /dev/null
+++ b/drivers/net/fs_enet/Kconfig
@@ -0,0 +1,20 @@
+config FS_ENET
+       tristate "Freescale Ethernet Driver"
+       depends on NET_ETHERNET && (CPM1 || CPM2)
+       select MII
+
+config FS_ENET_HAS_SCC
+        bool "Chip has an SCC usable for ethernet"
+        depends on FS_ENET && (CPM1 || CPM2)
+        default y
+
+config FS_ENET_HAS_FCC
+        bool "Chip has an FCC usable for ethernet"
+        depends on FS_ENET && CPM2
+        default y
+
+config FS_ENET_HAS_FEC
+        bool "Chip has an FEC usable for ethernet"
+        depends on FS_ENET && CPM1
+        default y
+