Merge branch 'linus' into core/iommu

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

diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 1c537d5..d913405 100644 (file)
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -24,8 +24,7 @@ config DE2104X
          will say Y here.) Do read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called de2104x.
 
 config TULIP
@@ -42,8 +41,7 @@ config TULIP
          will say Y here.) Do read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called tulip.
 
 config TULIP_MWI
@@ -67,7 +65,7 @@ config TULIP_MMIO
          If in doubt, say N.
 
 config TULIP_NAPI
-       bool "Use NAPI RX polling "
+       bool "Use RX polling (NAPI)"
        depends on TULIP
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -78,18 +76,16 @@ config TULIP_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
 
-         See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-         information.
-
          If in doubt, say N.
 
 config TULIP_NAPI_HW_MITIGATION
-       bool "Use Interrupt Mitigation "
+       bool "Use Interrupt Mitigation"
        depends on TULIP_NAPI
        ---help---
-         Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces
-         RX interrupts but itself. Although this reduces RX interrupts even at
-         low levels traffic at the cost of a small latency.
+         Use HW to reduce RX interrupts. Not strictly necessary since NAPI
+         reduces RX interrupts by itself. Interrupt mitigation reduces RX
+         interrupts even at low levels of traffic at the cost of a small
+         latency.
 
          If in doubt, say Y.
 
@@ -106,8 +102,7 @@ config DE4X5
          information is contained in
          <file:Documentation/networking/de4x5.txt>.
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called de4x5.
 
 config WINBOND_840
@@ -131,8 +126,7 @@ config DM9102
          (Ethernet) card, say Y.  Some information is contained in the file
          <file:Documentation/networking/dmfe.txt>.
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called dmfe.
 
 config ULI526X
@@ -143,12 +137,11 @@ config ULI526X
          This driver is for ULi M5261/M5263 10/100M Ethernet Controller
          (<http://www.uli.com.tw/>).
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called uli526x.
          
 config PCMCIA_XIRCOM
-       tristate "Xircom CardBus support (new driver)"
+       tristate "Xircom CardBus support"
        depends on CARDBUS
        ---help---
          This driver is for the Digital "Tulip" Ethernet CardBus adapters.
@@ -156,22 +149,7 @@ config PCMCIA_XIRCOM
          as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
          ASIX.
 
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
+         To compile this driver as a module, choose M here. The module will
          be called xircom_cb.  If unsure, say N.
 
-config PCMCIA_XIRTULIP
-       tristate "Xircom Tulip-like CardBus support (old driver)"
-       depends on CARDBUS && BROKEN_ON_SMP
-       select CRC32
-       ---help---
-         This driver is for the Digital "Tulip" Ethernet CardBus adapters.
-         It should work with most DEC 21*4*-based chips/ethercards, as well
-         as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
-         ASIX.
-
-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will
-         be called xircom_tulip_cb.  If unsure, say N.
-
 endif # NET_TULIP