Merge branch 'thinkpad-acpi' into release

[linux-2.6] / drivers / net / fs_enet / Kconfig

diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/fs_enet/Kconfig
index 6aaee67..562ea68 100644 (file)
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/fs_enet/Kconfig
@@ -1,7 +1,8 @@
 config FS_ENET
        tristate "Freescale Ethernet Driver"
-       depends on NET_ETHERNET && (CPM1 || CPM2)
+       depends on CPM1 || CPM2
        select MII
+       select PHYLIB
 
 config FS_ENET_HAS_SCC
        bool "Chip has an SCC usable for ethernet"
@@ -16,5 +17,14 @@ config FS_ENET_HAS_FCC
 config FS_ENET_HAS_FEC
        bool "Chip has an FEC usable for ethernet"
        depends on FS_ENET && CPM1
+       select FS_ENET_MDIO_FEC
        default y
 
+config FS_ENET_MDIO_FEC
+       tristate "MDIO driver for FEC"
+       depends on FS_ENET && CPM1
+
+config FS_ENET_MDIO_FCC
+       tristate "MDIO driver for FCC"
+       depends on FS_ENET && CPM2
+       select MDIO_BITBANG