Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3fed334..6c521b4 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,4 +1,3 @@
-

 #
 # Network device configuration
 #
 #
 # Network device configuration
 #


@@ -210,7 +209,7 @@ config MII
 
 config MACB
        tristate "Atmel MACB support"
 
 config MACB
        tristate "Atmel MACB support"

-       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
+       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9

        select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91
        select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91


@@ -517,15 +516,16 @@ config STNIC
 config SH_ETH
        tristate "Renesas SuperH Ethernet support"
        depends on SUPERH && \
 config SH_ETH
        tristate "Renesas SuperH Ethernet support"
        depends on SUPERH && \

-               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \
-                CPU_SUBTYPE_SH7619)
+               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
+                CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
+                CPU_SUBTYPE_SH7724)

        select CRC32
        select MII
        select MDIO_BITBANG
        select PHYLIB
        help
          Renesas SuperH Ethernet device driver.
        select CRC32
        select MII
        select MDIO_BITBANG
        select PHYLIB
        help
          Renesas SuperH Ethernet device driver.

-         This driver support SH7710, SH7712, SH7763 and SH7619.
+         This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.

 
 config SUNLANCE
        tristate "Sun LANCE support"
 
 config SUNLANCE
        tristate "Sun LANCE support"


@@ -918,6 +918,16 @@ config NET_NETX
          To compile this driver as a module, choose M here. The module
          will be called netx-eth.
 
          To compile this driver as a module, choose M here. The module
          will be called netx-eth.
 

+config TI_DAVINCI_EMAC
+       tristate "TI DaVinci EMAC Support"
+       depends on ARM && ARCH_DAVINCI
+       select PHYLIB
+       help
+         This driver supports TI's DaVinci Ethernet .
+
+         To compile this driver as a module, choose M here: the module
+         will be called davinci_emac_driver.  This is recommended.
+

 config DM9000
        tristate "DM9000 support"
        depends on ARM || BLACKFIN || MIPS
 config DM9000
        tristate "DM9000 support"
        depends on ARM || BLACKFIN || MIPS


@@ -963,6 +973,16 @@ config ENC28J60_WRITEVERIFY
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 

+config ETHOC
+       tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+       depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
+       select MII
+       select PHYLIB
+       select CRC32
+       select BITREVERSE
+       help
+         Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+

 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32


@@ -981,7 +1001,7 @@ config SMC911X
 
 config SMSC911X
        tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
 
 config SMSC911X
        tristate "SMSC LAN911x/LAN921x families embedded ethernet support"

-       depends on ARM || SUPERH
+       depends on ARM || SUPERH || BLACKFIN || MIPS

        select CRC32
        select MII
        select PHYLIB
        select CRC32
        select MII
        select PHYLIB


@@ -1040,6 +1060,17 @@ config NI65
          To compile this driver as a module, choose M here. The module
          will be called ni65.
 
          To compile this driver as a module, choose M here. The module
          will be called ni65.
 

+config DNET
+       tristate "Dave ethernet support (DNET)"
+       depends on NET_ETHERNET && HAS_IOMEM
+       select PHYLIB
+       help
+         The Dave ethernet interface (DNET) is found on Qong Board FPGA.
+         Say Y to include support for the DNET chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called dnet.
+

 source "drivers/net/tulip/Kconfig"
 
 config AT1700
 source "drivers/net/tulip/Kconfig"
 
 config AT1700


@@ -1692,6 +1723,29 @@ config TLAN
 
          Please email feedback to <torben.mathiasen@compaq.com>.
 
 
          Please email feedback to <torben.mathiasen@compaq.com>.
 

+config KS8842
+       tristate "Micrel KSZ8842"
+       depends on HAS_IOMEM
+       help
+         This platform driver is for Micrel KSZ8842 / KS8842
+         2-port ethernet switch chip (managed, VLAN, QoS).
+
+config KS8851
+       tristate "Micrel KS8851 SPI"
+       depends on SPI
+       select MII
+       select CRC32
+       help
+         SPI driver for Micrel KS8851 SPI attached network chip.
+
+config KS8851_MLL
+       tristate "Micrel KS8851 MLL"
+       depends on HAS_IOMEM
+       select MII
+       help
+         This platform driver is for Micrel KS8851 Address/data bus
+         multiplexed network chip.
+

 config VIA_RHINE
        tristate "VIA Rhine support"
        depends on NET_PCI && PCI
 config VIA_RHINE
        tristate "VIA Rhine support"
        depends on NET_PCI && PCI


@@ -1730,7 +1784,7 @@ config SC92031
 
 config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
 
 config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

-       depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
+       depends on NET_ETHERNET && EXPERIMENTAL && AR7

        select PHYLIB
        help
          TI AR7 CPMAC Ethernet support
        select PHYLIB
        help
          TI AR7 CPMAC Ethernet support


@@ -1828,8 +1882,8 @@ config 68360_ENET
          the Motorola 68360 processor.
 
 config FEC
          the Motorola 68360 processor.
 
 config FEC

-       bool "FEC ethernet controller (of ColdFire CPUs)"
-       depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
+       bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
+       depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 || ARCH_MX25

        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire and Freescale i.MX processors.
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire and Freescale i.MX processors.


@@ -1850,7 +1904,7 @@ config FEC_MPC52xx
        ---help---
          This option enables support for the MPC5200's on-chip
          Fast Ethernet Controller
        ---help---
          This option enables support for the MPC5200's on-chip
          Fast Ethernet Controller

-         If compiled as module, it will be called 'fec_mpc52xx.ko'.
+         If compiled as module, it will be called fec_mpc52xx.

 
 config FEC_MPC52xx_MDIO
        bool "MPC52xx FEC MDIO bus driver"
 
 config FEC_MPC52xx_MDIO
        bool "MPC52xx FEC MDIO bus driver"


@@ -1862,7 +1916,7 @@ config FEC_MPC52xx_MDIO
          (Motorola? industry standard).
          If your board uses an external PHY connected to FEC, enable this.
          If not sure, enable.
          (Motorola? industry standard).
          If your board uses an external PHY connected to FEC, enable this.
          If not sure, enable.

-         If compiled as module, it will be called 'fec_mpc52xx_phy.ko'.
+         If compiled as module, it will be called fec_mpc52xx_phy.

 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"


@@ -1882,6 +1936,21 @@ config ATL2
          To compile this driver as a module, choose M here.  The module
          will be called atl2.
 
          To compile this driver as a module, choose M here.  The module
          will be called atl2.
 

+config XILINX_EMACLITE
+       tristate "Xilinx 10/100 Ethernet Lite support"
+       depends on PPC32 || MICROBLAZE
+       help
+         This driver supports the 10/100 Ethernet Lite from Xilinx.
+
+config BCM63XX_ENET
+       tristate "Broadcom 63xx internal mac support"
+       depends on BCM63XX
+       select MII
+       select PHYLIB
+       help
+         This driver supports the ethernet MACs in the Broadcom 63xx
+         MIPS chipset family (BCM63XX).
+

 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET


@@ -2019,14 +2088,6 @@ config IGB
          To compile this driver as a module, choose M here. The module
          will be called igb.
 
          To compile this driver as a module, choose M here. The module
          will be called igb.
 

-config IGB_LRO 
-       bool "Use software LRO"
-       depends on IGB && INET
-       ---help---
-         Say Y here if you want to use large receive offload. 
-
-         If in doubt, say N.
-

 config IGB_DCA
        bool "Direct Cache Access (DCA) Support"
        default y
 config IGB_DCA
        bool "Direct Cache Access (DCA) Support"
        default y


@@ -2036,6 +2097,27 @@ config IGB_DCA
          driver.  DCA is a method for warming the CPU cache before data
          is used, with the intent of lessening the impact of cache misses.
 
          driver.  DCA is a method for warming the CPU cache before data
          is used, with the intent of lessening the impact of cache misses.
 

+config IGBVF
+       tristate "Intel(R) 82576 Virtual Function Ethernet support"
+       depends on PCI
+       ---help---
+         This driver supports Intel(R) 82576 virtual functions.  For more
+         information on how to identify your adapter, go to the Adapter &
+         Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called igbvf.
+

 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS


@@ -2157,7 +2239,7 @@ config SKGE_DEBUG
        depends on SKGE && DEBUG_FS
        help
         This option adds the ability to dump driver state for debugging.
        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
+        The file /sys/kernel/debug/skge/ethX displays the state of the internal

         transmit and receive rings.
 
         If unsure, say N.
         transmit and receive rings.
 
         If unsure, say N.


@@ -2183,7 +2265,7 @@ config SKY2_DEBUG
        depends on SKY2 && DEBUG_FS
        help
         This option adds the ability to dump driver state for debugging.
        depends on SKY2 && DEBUG_FS
        help
         This option adds the ability to dump driver state for debugging.

-        The file debugfs/sky2/ethX displays the state of the internal
+        The file /sys/kernel/debug/sky2/ethX displays the state of the internal

         transmit and receive rings.
 
         If unsure, say N.
         transmit and receive rings.
 
         If unsure, say N.


@@ -2214,13 +2296,25 @@ config BNX2
        tristate "Broadcom NetXtremeII support"
        depends on PCI
        select CRC32
        tristate "Broadcom NetXtremeII support"
        depends on PCI
        select CRC32

-       select ZLIB_INFLATE
+       select FW_LOADER

        help
          This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
 
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
 
        help
          This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
 
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
 

+config CNIC
+       tristate "Broadcom CNIC support"
+       depends on PCI
+       select BNX2
+       select UIO
+       help
+         This driver supports offload features of Broadcom NetXtremeII
+         gigabit Ethernet cards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called cnic.  This is recommended.
+

 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)


@@ -2250,6 +2344,7 @@ config GELIC_NET
 
 config GELIC_WIRELESS
        bool "PS3 Wireless support"
 
 config GELIC_WIRELESS
        bool "PS3 Wireless support"

+       depends on WLAN

        depends on GELIC_NET
        select WIRELESS_EXT
        help
        depends on GELIC_NET
        select WIRELESS_EXT
        help


@@ -2262,6 +2357,7 @@ config GELIC_WIRELESS
 config GELIC_WIRELESS_OLD_PSK_INTERFACE
        bool "PS3 Wireless private PSK interface (OBSOLETE)"
        depends on GELIC_WIRELESS
 config GELIC_WIRELESS_OLD_PSK_INTERFACE
        bool "PS3 Wireless private PSK interface (OBSOLETE)"
        depends on GELIC_WIRELESS

+       select WEXT_PRIV

        help
           This option retains the obsolete private interface to pass
           the PSK from user space programs to the driver.  The PSK
        help
           This option retains the obsolete private interface to pass
           the PSK from user space programs to the driver.  The PSK


@@ -2298,17 +2394,14 @@ config UCC_GETH
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 

-config UGETH_MAGIC_PACKET
-       bool "Magic Packet detection support"
-       depends on UCC_GETH
-

 config UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH
 
 config MV643XX_ETH
        tristate "Marvell Discovery (643XX) and Orion ethernet support"
 config UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH
 
 config MV643XX_ETH
        tristate "Marvell Discovery (643XX) and Orion ethernet support"

-       depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+       depends on MV64X60 || PPC32 || PLAT_ORION
+       select INET_LRO

        select PHYLIB
        help
          This driver supports the gigabit ethernet MACs in the
        select PHYLIB
        help
          This driver supports the gigabit ethernet MACs in the


@@ -2318,15 +2411,13 @@ config MV643XX_ETH
          Some boards that use the Discovery chipset are the Momenco
          Ocelot C and Jaguar ATX and Pegasos II.
 
          Some boards that use the Discovery chipset are the Momenco
          Ocelot C and Jaguar ATX and Pegasos II.
 

-config MV643XX_ETH_LRO
-       tristate "Marvell 643XX ethernet driver LRO support"
-       depends on MV643XX_ETH
-       select INET_LRO
+config XILINX_LL_TEMAC
+       tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+       select PHYLIB
+       depends on PPC_DCR_NATIVE

        help
        help

-         Say y here if you want to use Large Receive Offload for the
-         mv643xx_eth driver.
-
-         If in doubt, say N.
+         This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
+         core used in Xilinx Spartan and Virtex FPGAs

 
 config QLA3XXX
        tristate "QLogic QLA3XXX Network Driver Support"
 
 config QLA3XXX
        tristate "QLogic QLA3XXX Network Driver Support"


@@ -2360,6 +2451,17 @@ config ATL1E
          To compile this driver as a module, choose M here.  The module
          will be called atl1e.
 
          To compile this driver as a module, choose M here.  The module
          will be called atl1e.
 

+config ATL1C
+       tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       select MII
+       help
+         This driver supports the Atheros L1C gigabit ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1c.
+

 config JME
        tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
        depends on PCI
 config JME
        tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
        depends on PCI


@@ -2372,6 +2474,19 @@ config JME
          To compile this driver as a module, choose M here. The module
          will be called jme.
 
          To compile this driver as a module, choose M here. The module
          will be called jme.
 

+config S6GMAC
+       tristate "S6105 GMAC ethernet support"
+       depends on XTENSA_VARIANT_S6000
+       select PHYLIB
+       help
+         This driver supports the on chip ethernet device on the
+         S6105 xtensa processor.
+
+         To compile this driver as a module, choose M here. The module
+         will be called s6gmac.
+
+source "drivers/net/stmmac/Kconfig"
+

 endif # NETDEV_1000
 
 #
 endif # NETDEV_1000
 
 #


@@ -2390,10 +2505,14 @@ menuconfig NETDEV_10000
 
 if NETDEV_10000
 
 
 if NETDEV_10000
 

+config MDIO
+       tristate
+

 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
         depends on PCI
        select CRC32
 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
         depends on PCI
        select CRC32

+       select MDIO

         help
           This driver supports Chelsio gigabit and 10-gigabit
           Ethernet cards. More information about adapter features and
         help
           This driver supports Chelsio gigabit and 10-gigabit
           Ethernet cards. More information about adapter features and


@@ -2426,6 +2545,7 @@ config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"
        depends on CHELSIO_T3_DEPENDS
        select FW_LOADER
        tristate "Chelsio Communications T3 10Gb Ethernet support"
        depends on CHELSIO_T3_DEPENDS
        select FW_LOADER

+       select MDIO

        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.
        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.


@@ -2461,6 +2581,7 @@ config ENIC
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"
        depends on PCI && INET
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"
        depends on PCI && INET

+       select MDIO

        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go
        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go


@@ -2525,6 +2646,23 @@ config S2IO
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 

+config VXGE
+       tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"
+       depends on PCI && INET
+       ---help---
+         This driver supports Neterion Inc's X3100 Series 10 GbE PCIe
+         I/O Virtualized Server Adapter.
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/vxge.txt>.
+
+config VXGE_DEBUG_TRACE_ALL
+       bool "Enabling All Debug trace statments in driver"
+       default n
+       depends on VXGE
+       ---help---
+         Say Y here if you want to enabling all the debug trace statements in
+         driver. By  default only few debug trace statements are enabled.
+

 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET
 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET


@@ -2560,6 +2698,7 @@ config NETXEN_NIC
 config NIU
        tristate "Sun Neptune 10Gbit Ethernet support"
        depends on PCI
 config NIU
        tristate "Sun Neptune 10Gbit Ethernet support"
        depends on PCI

+       select CRC32

        help
          This enables support for cards based upon Sun's
          Neptune chipset.
        help
          This enables support for cards based upon Sun's
          Neptune chipset.


@@ -2606,8 +2745,10 @@ config TEHUTI
 config BNX2X
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI
 config BNX2X
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI

+       select FW_LOADER

        select ZLIB_INFLATE
        select LIBCRC32C
        select ZLIB_INFLATE
        select LIBCRC32C

+       select MDIO

        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module
        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module


@@ -2624,6 +2765,8 @@ config QLGE
 
 source "drivers/net/sfc/Kconfig"
 
 
 source "drivers/net/sfc/Kconfig"
 

+source "drivers/net/benet/Kconfig"
+

 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"


@@ -2640,6 +2783,8 @@ source "drivers/net/wan/Kconfig"
 
 source "drivers/atm/Kconfig"
 
 
 source "drivers/atm/Kconfig"
 

+source "drivers/ieee802154/Kconfig"
+

 source "drivers/s390/net/Kconfig"
 
 config XEN_NETDEV_FRONTEND
 source "drivers/s390/net/Kconfig"
 
 config XEN_NETDEV_FRONTEND


@@ -3091,4 +3236,12 @@ config VIRTIO_NET
          This is the virtual network driver for virtio.  It can be used with
           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
 
          This is the virtual network driver for virtio.  It can be used with
           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
 

+config VMXNET3
+       tristate "VMware VMXNET3 ethernet driver"
+       depends on PCI && INET
+       help
+         This driver supports VMware's vmxnet3 virtual ethernet NIC.
+         To compile this driver as a module, choose M here: the
+         module will be called vmxnet3.
+

 endif # NETDEVICES
 endif # NETDEVICES