e1000: reorder e1000_param.c

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 28c17d1ca5cb8c1e4b19c2467c3b1c6b304cc3d2..112d4cd5c66c88dd6109d2fa3a39df1c0084b9f3 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -32,7 +32,7 @@ config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
        ---help---
-         This is an intermidiate driver that allows sharing of
+         This is an intermediate driver that allows sharing of
          resources.
          To compile this driver as a module, choose M here: the module
          will be called ifb.  If you want to use more than one ifb
@@ -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.
@@ -1769,8 +1769,8 @@ config VIA_RHINE_NAPI
          information.
 
 config LAN_SAA9730
-       bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
-       depends on NET_PCI && EXPERIMENTAL && MIPS
+       bool "Philips SAA9730 Ethernet support"
+       depends on NET_PCI && PCI && MIPS_ATLAS
        help
          The SAA9730 is a combined multimedia and peripheral controller used
          in thin clients, Internet access terminals, and diskless
@@ -2136,7 +2136,7 @@ config SK98LIN
          This driver supports the original Yukon chipset. A cleaner driver is 
          also available (skge) which seems to work better than this one.
 
-         This driver does not support the newer Yukon2 chipset. A seperate
+         This driver does not support the newer Yukon2 chipset. A separate
          driver, sky2, is provided to support Yukon2-based adapters.
 
          The following adapters are supported by this driver:
@@ -2447,6 +2447,11 @@ config MYRI10GE
          <file:Documentation/networking/net-modules.txt>.  The module
          will be called myri10ge.
 
+config NETXEN_NIC
+       tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+       help
+         This enables the support for NetXen's Gigabit Ethernet card.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"
@@ -2467,7 +2472,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 +2838,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 +2847,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.