1 files changed, 7 insertions, 34 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 83d52c8acab0..2cafa5c1783e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1293,9 +1293,6 @@ config PCNET32_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 AMD8111_ETH
@@ -1313,7 +1310,7 @@ config AMD8111_ETH
           will be called amd8111e.
 
 config AMD8111E_NAPI
-        bool "Enable NAPI support"
+        bool "Use RX polling (NAPI)"
         depends on AMD8111_ETH
         help
           NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1324,9 +1321,6 @@ config AMD8111E_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 ADAPTEC_STARFIRE
@@ -1355,9 +1349,6 @@ config ADAPTEC_STARFIRE_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 AC3200
@@ -1431,7 +1422,7 @@ config FORCEDETH
           called forcedeth.
 
 config FORCEDETH_NAPI
-        bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
         depends on FORCEDETH && EXPERIMENTAL
         help
           NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1442,9 +1433,6 @@ config FORCEDETH_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 CS89x0
@@ -1756,9 +1744,6 @@ config VIA_RHINE_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.
-
 config LAN_SAA9730
         bool "Philips SAA9730 Ethernet support"
         depends on NET_PCI && PCI && MIPS_ATLAS
@@ -2003,9 +1988,6 @@ config E1000_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 E1000_DISABLE_PACKET_SPLIT
@@ -2099,7 +2081,7 @@ config R8169
           will be called r8169.  This is recommended.
 
 config R8169_NAPI
-        bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
         depends on R8169 && EXPERIMENTAL
         help
           NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -2110,9 +2092,6 @@ config R8169_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 R8169_VLAN
@@ -2364,7 +2343,7 @@ config GIANFAR
           and MPC86xx family of chips, and the FEC on the 8540.
 
 config GFAR_NAPI
-        bool "NAPI Support"
+        bool "Use Rx Polling (NAPI)"
         depends on GIANFAR
 
 config UCC_GETH
@@ -2376,7 +2355,7 @@ config UCC_GETH
           which is available on some Freescale SOCs.
 
 config UGETH_NAPI
-        bool "NAPI Support"
+        bool "Use Rx Polling (NAPI)"
         depends on UCC_GETH
 
 config UGETH_MAGIC_PACKET
@@ -2494,7 +2473,7 @@ config CHELSIO_T3
 
 config EHEA
         tristate "eHEA Ethernet support"
-        depends on IBMEBUS
+        depends on IBMEBUS && INET
         select INET_LRO
         ---help---
           This driver supports the IBM pSeries eHEA ethernet adapter.
@@ -2559,9 +2538,6 @@ config IXGB_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 S2IO
@@ -2584,14 +2560,11 @@ config S2IO_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 MYRI10GE
         tristate "Myricom Myri-10G Ethernet support"
-        depends on PCI
+        depends on PCI && INET
         select FW_LOADER
         select CRC32
         select INET_LRO