Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 28c17d1ca5cb8c1e4b19c2467c3b1c6b304cc3d2..6e863aa9894c9ed4af4e89d9a56be08f3a00a541 100644 (file)
--- 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.
@@ -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"
@@ -2833,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
@@ -2842,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.