Pull sn-features into release branch

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

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index c2f1bf1d02d2254f734ac5009e014edd95620915..14f4de1a8180289db3f05ca5395c3a93d6df0296 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -6,14 +6,14 @@ menu "PHY device support"
 
 config PHYLIB
        tristate "PHY Device support and infrastructure"
-       depends on NET_ETHERNET
+       depends on NET_ETHERNET && (BROKEN || !ARCH_S390)
        help
          Ethernet controllers are usually attached to PHY
          devices.  This option provides infrastructure for
          managing PHY devices.
 
 config PHYCONTROL
-       bool "Support for automatically handling PHY state changes"
+       bool "  Support for automatically handling PHY state changes"
        depends on PHYLIB
        help
          Adds code to perform all the work for keeping PHY link