Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

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

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index b79ec0d..09b6f25 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,67 +2,65 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
        tristate "PHY Device support and infrastructure"
+       depends on !S390
        depends on NET_ETHERNET && (BROKEN || !S390)
        help
          Ethernet controllers are usually attached to PHY
          devices.  This option provides infrastructure for
          managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-       depends on PHYLIB
 
 config MARVELL_PHY
        tristate "Drivers for Marvell PHYs"
-       depends on PHYLIB
        ---help---
          Currently has a driver for the 88E1011S
        
 config DAVICOM_PHY
        tristate "Drivers for Davicom PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
        tristate "Drivers for Quality Semiconductor PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the qs6612
 
 config LXT_PHY
        tristate "Drivers for the Intel LXT PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the lxt970, lxt971
 
 config CICADA_PHY
        tristate "Drivers for the Cicada PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the cis8204
+
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
        tristate "Drivers for SMSC PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the LAN83C185 PHY
 
+config BROADCOM_PHY
+       tristate "Drivers for Broadcom PHYs"
+       ---help---
+         Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
+
 config FIXED_PHY
        tristate "Drivers for PHY emulation on fixed speed/link"
-       depends on PHYLIB
        ---help---
          Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
-         but with the ability to manipulate with speed/link in software. The relavant MII
-         speed/duplex parameters could be effectively handled in user-specified  fuction.
+         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
@@ -73,5 +71,4 @@ config FIXED_MII_100_FDX
        bool "Emulation for 100M Fdx fixed PHY behavior"
        depends on FIXED_PHY
 
-endmenu
-
+endif # PHYLIB