Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

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

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 432c210513bedb764888bafd3ace5f412c5f4f3d..3ac8529bb92ca9915b76b2cb1026f5308f05c107 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -60,34 +60,27 @@ config ICPLUS_PHY
        ---help---
          Currently supports the IP175C PHY.
 
+config REALTEK_PHY
+       tristate "Drivers for Realtek PHYs"
+       ---help---
+         Supports the Realtek 821x PHY.
+
 config FIXED_PHY
-       tristate "Drivers for PHY emulation on fixed speed/link"
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
        ---help---
-         Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
-         but with the ability to manipulate the speed/link in software. The relevant MII
-         speed/duplex parameters could be effectively handled in a user-specified function.
-         Currently tested with mpc866ads.
-
-config FIXED_MII_10_FDX
-       bool "Emulation for 10M Fdx fixed PHY behavior"
-       depends on FIXED_PHY
-
-config FIXED_MII_100_FDX
-       bool "Emulation for 100M Fdx fixed PHY behavior"
-       depends on FIXED_PHY
-
-config FIXED_MII_1000_FDX
-       bool "Emulation for 1000M Fdx fixed PHY behavior"
-       depends on FIXED_PHY
-
-config FIXED_MII_AMNT
-        int "Number of emulated PHYs to allocate "
-        depends on FIXED_PHY
-        default "1"
-        ---help---
-        Sometimes it is required to have several independent emulated
-        PHYs on the bus (in case of multi-eth but phy-less HW for instance).
-        This control will have specified number allocated for each fixed
-        PHY type enabled.
+         Adds the platform "fixed" MDIO Bus to cover the boards that use
+         PHYs that are not connected to the real MDIO bus.
+
+         Currently tested with mpc866ads and mpc8349e-mitx.
+
+config MDIO_BITBANG
+       tristate "Support for bitbanged MDIO buses"
+       help
+         This module implements the MDIO bus protocol in software,
+         for use by low level drivers that export the ability to
+         drive the relevant pins.
+
+         If in doubt, say N.
 
 endif # PHYLIB