Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / tulip / Kconfig

diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 516713fa0a0570a4d3faf871fa4cf1089297981b..1f8d4a8d8ea43ab09838026b3eb54f7ab881fdbc 100644 (file)
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -11,8 +11,8 @@ menuconfig NET_TULIP
 if NET_TULIP
 
 config DE2104X
-       tristate "Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
+       tristate "Early DECchip Tulip (dc2104x) PCI support"
+       depends on PCI
        select CRC32
        ---help---
          This driver is developed for the SMC EtherPower series Ethernet
@@ -151,7 +151,7 @@ config ULI526X
        select CRC32
        ---help---
          This driver is for ULi M5261/M5263 10/100M Ethernet Controller
-         (<http://www.uli.com.tw/>).
+         (<http://www.nvidia.com/page/uli_drivers.html>).
 
          To compile this driver as a module, choose M here. The module will
          be called uli526x.