Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[sfrench/cifs-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9ff1cf46eaee799b81d7cb34b7dfd5cf99fa4dfa..ce34b539bf38e7f12f4ab638f15f7088ab482e0c 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -240,6 +240,13 @@ config AX88796
          AX88796 driver, using platform bus to provide
          chip detection and resources
 
+config AX88796_93CX6
+       bool "ASIX AX88796 external 93CX6 eeprom support"
+       depends on AX88796
+       select EEPROM_93CX6
+       help
+         Select this if your platform comes with an external 93CX6 eeprom.
+
 config MACE
        tristate "MACE (Power Mac ethernet) support"
        depends on PPC_PMAC && PPC32
@@ -848,7 +855,7 @@ config BFIN_MAC_USE_L1
        depends on BFIN_MAC && BF537
        default y
        help
-         To get maximum network performace, you should use L1 memory as rx/tx buffers.
+         To get maximum network performance, you should use L1 memory as rx/tx buffers.
          Say N here if you want to reserve L1 memory for other uses.
 
 config BFIN_TX_DESC_NUM
@@ -937,7 +944,7 @@ config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
-       depends on ARCH_PXA
+       depends on ARCH_PXA || SUPERH
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -1286,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
@@ -1306,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
@@ -1317,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
@@ -1348,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
@@ -1424,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
@@ -1435,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
@@ -1749,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
@@ -1773,6 +1765,15 @@ config SC92031
          To compile this driver as a module, choose M here: the module
          will be called sc92031.  This is recommended.
 
+config CPMAC
+       tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
+       depends on NET_ETHERNET && EXPERIMENTAL && AR7
+       select PHYLIB
+       select FIXED_PHY
+       select FIXED_MII_100_FDX
+       help
+         TI AR7 CPMAC Ethernet support
+
 config NET_POCKET
        bool "Pocket and portable adapters"
        depends on PARPORT
@@ -1987,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
@@ -2083,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
@@ -2094,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
@@ -2157,6 +2152,16 @@ config SKGE
          To compile this driver as a module, choose M here: the module
          will be called skge.  This is recommended.
 
+config SKGE_DEBUG
+       bool "Debugging interface"
+       depends on SKGE && DEBUG_FS
+       help
+        This option adds the ability to dump driver state for debugging.
+        The file debugfs/skge/ethX displays the state of the internal
+        transmit and receive rings.
+
+        If unsure, say N.
+
 config SKY2
        tristate "SysKonnect Yukon2 support"
        depends on PCI
@@ -2338,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
@@ -2350,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
@@ -2468,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.
@@ -2533,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
@@ -2558,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
@@ -2587,6 +2586,13 @@ config NETXEN_NIC
        help
          This enables the support for NetXen's Gigabit Ethernet card.
 
+config NIU
+       tristate "Sun Neptune 10Gbit Ethernet support"
+       depends on PCI
+       help
+         This enables support for cards based upon Sun's
+         Neptune chipset.
+
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
        depends on PPC64 && PCI