Merge branch 'upstream'

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d4d8e5f9ebf14a7382546ecebcd6bad8f5c161d3..00993e8ba589812995d4ad140de2b6bad4e08f02 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1372,8 +1372,8 @@ config B44
          called b44.
 
 config FORCEDETH
-       tristate "Reverse Engineered nForce Ethernet support (EXPERIMENTAL)"
-       depends on NET_PCI && PCI && EXPERIMENTAL
+       tristate "nForce Ethernet support"
+       depends on NET_PCI && PCI
        help
          If you have a network (Ethernet) controller of this type, say Y and
          read the Ethernet-HOWTO, available from
@@ -1914,7 +1914,7 @@ config E1000_DISABLE_PACKET_SPLIT
        depends on E1000
        help
          Say Y here if you want to use the legacy receive path for PCI express
-         hadware.
+         hardware.
 
          If in doubt, say N.