1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ab92cc794c64..6e863aa9894c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -486,7 +486,7 @@ config SGI_IOC3_ETH_HW_TX_CSUM
 
 config MIPS_SIM_NET
         tristate "MIPS simulator Network device (EXPERIMENTAL)"
-        depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
+        depends on MIPS_SIM && EXPERIMENTAL
         help
           The MIPSNET device is a simple Ethernet network device which is
           emulated by the MIPS Simulator.
@@ -2112,7 +2112,7 @@ config SKGE
 
 config SKY2
         tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         select CRC32
         ---help---
           This driver supports Gigabit Ethernet adapters based on the
@@ -2120,8 +2120,8 @@ config SKY2
           Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
           88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
 
-          This driver does not support the original Yukon chipset: a seperate
-          driver, skge, is provided for Yukon-based adapters.
+          There is companion driver for the older Marvell Yukon and
+          Genesis based adapters: skge.
 
           To compile this driver as a module, choose M here: the module
           will be called sky2.  This is recommended.
@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND
 
 config UGETH_HAS_GIGA
         bool
-        depends on UCC_GETH && MPC836x
+        depends on UCC_GETH && PPC_MPC836x
 
 config MV643XX_ETH
         tristate "MV-643XX Ethernet support"
@@ -2467,7 +2467,7 @@ config ISERIES_VETH
 
 config RIONET
         tristate "RapidIO Ethernet over messaging driver support"
-        depends on NETDEVICES && RAPIDIO
+        depends on RAPIDIO
 
 config RIONET_TX_SIZE
         int "Number of outbound queue entries"
@@ -2717,6 +2717,7 @@ config PPP_MPPE
        select CRYPTO
        select CRYPTO_SHA1
        select CRYPTO_ARC4
+       select CRYPTO_ECB
        ---help---
          Support for the MPPE Encryption protocol, as employed by the
          Microsoft Point-to-Point Tunneling Protocol.
@@ -2832,7 +2833,7 @@ config NET_FC
           "SCSI generic support".
 
 config SHAPER
-        tristate "Traffic Shaper (EXPERIMENTAL)"
+        tristate "Traffic Shaper (OBSOLETE)"
         depends on EXPERIMENTAL
         ---help---
           The traffic shaper is a virtual network device that allows you to
@@ -2841,9 +2842,9 @@ config SHAPER
           these virtual devices. See
           <file:Documentation/networking/shaper.txt> for more information.
 
-          An alternative to this traffic shaper is the experimental
-          Class-Based Queuing (CBQ) scheduling support which you get if you
-          say Y to "QoS and/or fair queuing" above.
+          An alternative to this traffic shaper are traffic schedulers which
+          you'll get if you say Y to "QoS and/or fair queuing" in
+          "Networking options".
 
           To compile this driver as a module, choose M here: the module
           will be called shaper.  If unsure, say N.