drivers/net/wan: Add missing "space"

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a6728661c4167ffa065503e2bebcd594b6748b2e..b034410b7ab63e520143cdd527dcb9f17bb4f0d5 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1584,6 +1584,18 @@ config 8139_OLD_RX_RESET
          experience problems, you can enable this option to restore the
          old RX-reset behavior.  If unsure, say N.
 
+config R6040
+       tristate "RDC R6040 Fast Ethernet Adapter support (EXPERIMENTAL)"
+       depends on NET_PCI && PCI
+       select CRC32
+       select MII
+       help
+         This is a driver for the R6040 Fast Ethernet MACs found in the
+         the RDC R-321x System-on-chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called r6040. This is recommended.
+
 config SIS900
        tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
@@ -2585,6 +2597,15 @@ config TEHUTI
        help
          Tehuti Networks 10G Ethernet NIC
 
+config BNX2X
+       tristate "Broadcom NetXtremeII 10Gb support"
+       depends on PCI
+       help
+         This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
+         To compile this driver as a module, choose M here: the module
+         will be called bnx2x.  This is recommended.
+
+
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
@@ -3015,23 +3036,6 @@ config NET_FC
          adaptor below. You also should have said Y to "SCSI support" and
          "SCSI generic support".
 
-config SHAPER
-       tristate "Traffic Shaper (OBSOLETE)"
-       depends on EXPERIMENTAL
-       ---help---
-         The traffic shaper is a virtual network device that allows you to
-         limit the rate of outgoing data flow over some other network device.
-         The traffic that you want to slow down can then be routed through
-         these virtual devices. See
-         <file:Documentation/networking/shaper.txt> for more information.
-
-         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.
-
 config NETCONSOLE
        tristate "Network console logging support (EXPERIMENTAL)"
        depends on EXPERIMENTAL