Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...

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

diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 6182cf4..8c9634a 100644 (file)
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -40,9 +40,7 @@ config TULIP
          (smc9332dst), you can also try the driver for "Generic DECchip"
          cards, above.  However, most people with a network card of this type
          will say Y here.) Do read the Ethernet-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.  More specific
-         information is contained in 
-         <file:Documentation/networking/tulip.txt>.
+         <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
@@ -137,6 +135,18 @@ config DM9102
          <file:Documentation/networking/net-modules.txt>.  The module will
          be called dmfe.
 
+config ULI526X
+       tristate "ULi M526x controller support"
+       depends on NET_TULIP && PCI
+       select CRC32
+       ---help---
+         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
+         be called uli526x.
+         
 config PCMCIA_XIRCOM
        tristate "Xircom CardBus support (new driver)"
        depends on NET_TULIP && CARDBUS