mwl8k: remove usage of deprecated noise value

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5f6509a..7029cd5 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -90,6 +90,18 @@ config MACVLAN
          To compile this driver as a module, choose M here: the module
          will be called macvlan.
 
          To compile this driver as a module, choose M here: the module
          will be called macvlan.
 

+config MACVTAP
+       tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
+       depends on MACVLAN
+       help
+         This adds a specialized tap character device driver that is based
+         on the MAC-VLAN network interface, called macvtap. A macvtap device
+         can be added in the same way as a macvlan device, using 'type
+         macvlan', and then be accessed through the tap user space interface.
+
+         To compile this driver as a module, choose M here: the module
+         will be called macvtap.
+

 config EQUALIZER
        tristate "EQL (serial line load balancing) support"
        ---help---
 config EQUALIZER
        tristate "EQL (serial line load balancing) support"
        ---help---


@@ -209,7 +221,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


@@ -868,8 +880,8 @@ config BFIN_RX_DESC_NUM
          Set the number of buffer packets used in driver.
 
 config BFIN_MAC_RMII
          Set the number of buffer packets used in driver.
 
 config BFIN_MAC_RMII

-       bool "RMII PHY Interface (EXPERIMENTAL)"
-       depends on BFIN_MAC && EXPERIMENTAL
+       bool "RMII PHY Interface"
+       depends on BFIN_MAC

        default y if BFIN527_EZKIT
        default n if BFIN537_STAMP
        help
        default y if BFIN527_EZKIT
        default n if BFIN537_STAMP
        help


@@ -920,7 +932,7 @@ config NET_NETX
 
 config TI_DAVINCI_EMAC
        tristate "TI DaVinci EMAC Support"
 
 config TI_DAVINCI_EMAC
        tristate "TI DaVinci EMAC Support"

-       depends on ARM && ARCH_DAVINCI
+       depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )

        select PHYLIB
        help
          This driver supports TI's DaVinci Ethernet .
        select PHYLIB
        help
          This driver supports TI's DaVinci Ethernet .


@@ -975,7 +987,7 @@ config ENC28J60_WRITEVERIFY
 
 config ETHOC
        tristate "OpenCores 10/100 Mbps Ethernet MAC support"
 
 config ETHOC
        tristate "OpenCores 10/100 Mbps Ethernet MAC support"

-       depends on NET_ETHERNET && HAS_IOMEM
+       depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA

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


@@ -983,6 +995,14 @@ config ETHOC
        help
          Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
 
        help
          Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
 

+config GRETH
+       tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
+       depends on SPARC
+       select PHYLIB
+       select CRC32
+       help
+         Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
+

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


@@ -1001,7 +1021,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 || BLACKFIN
+       depends on ARM || SUPERH || BLACKFIN || MIPS

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


@@ -1368,6 +1388,17 @@ config AC3200
          To compile this driver as a module, choose M here. The module
          will be called ac3200.
 
          To compile this driver as a module, choose M here. The module
          will be called ac3200.
 

+config KSZ884X_PCI
+       tristate "Micrel KSZ8841/2 PCI"
+       depends on NET_PCI && PCI
+       select MII
+       select CRC32
+       help
+         This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ksz884x.
+

 config APRICOT
        tristate "Apricot Xen-II on board Ethernet"
        depends on NET_PCI && ISA
 config APRICOT
        tristate "Apricot Xen-II on board Ethernet"
        depends on NET_PCI && ISA


@@ -1727,15 +1758,25 @@ config KS8842
        tristate "Micrel KSZ8842"
        depends on HAS_IOMEM
        help
        tristate "Micrel KSZ8842"
        depends on HAS_IOMEM
        help

-         This platform driver is for Micrel KSZ8842 chip.
+         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
 
 config KS8851
        tristate "Micrel KS8851 SPI"
        depends on SPI
        select MII

+       select CRC32

        help
          SPI driver for Micrel KS8851 SPI attached network chip.
 
        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


@@ -1774,7 +1815,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


@@ -1873,7 +1914,8 @@ config 68360_ENET
 
 config FEC
        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 
 config FEC
        bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

-       depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35
+       depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
+               MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5

        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.


@@ -1926,8 +1968,26 @@ 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
+       select PHYLIB
+       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"
 
 source "drivers/net/fs_enet/Kconfig"
 

+source "drivers/net/octeon/Kconfig"
+

 endif # NET_ETHERNET
 
 #
 endif # NET_ETHERNET
 
 #


@@ -2319,6 +2379,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


@@ -2328,19 +2389,6 @@ config GELIC_WIRELESS
          the driver automatically distinguishes the models, you can
          safely enable this option even if you have a wireless-less model.
 
          the driver automatically distinguishes the models, you can
          safely enable this option even if you have a wireless-less model.
 

-config GELIC_WIRELESS_OLD_PSK_INTERFACE
-       bool "PS3 Wireless private PSK interface (OBSOLETE)"
-       depends on GELIC_WIRELESS
-       help
-          This option retains the obsolete private interface to pass
-          the PSK from user space programs to the driver.  The PSK
-          stands for 'Pre Shared Key' and is used for WPA[2]-PSK
-          (WPA-Personal) environment.
-          If WPA[2]-PSK is used and you need to use old programs that
-          support only this old interface, say Y.  Otherwise N.
-
-          If unsure, say N.
-

 config FSL_PQ_MDIO
        tristate "Freescale PQ MDIO"
        depends on FSL_SOC
 config FSL_PQ_MDIO
        tristate "Freescale PQ MDIO"
        depends on FSL_SOC


@@ -2367,10 +2415,6 @@ 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 UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH


@@ -2462,6 +2506,8 @@ config S6GMAC
          To compile this driver as a module, choose M here. The module
          will be called s6gmac.
 
          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
 
 #


@@ -2591,6 +2637,28 @@ config IXGBE_DCB
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config IXGBEVF
+       tristate "Intel(R) 82599 Virtual Function Ethernet support"
+       depends on PCI_MSI
+       ---help---
+         This driver supports Intel(R) 82599 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/sb/CS-008441.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/ixgbevf.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgbevf.  MSI-X interrupt support is required
+         for this driver to work correctly.
+

 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI


@@ -2673,6 +2741,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.


@@ -2722,11 +2791,19 @@ config BNX2X
        select FW_LOADER
        select ZLIB_INFLATE
        select LIBCRC32C
        select FW_LOADER
        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
          will be called bnx2x.  This is recommended.
 
        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module
          will be called bnx2x.  This is recommended.
 

+config QLCNIC
+       tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
+       depends on PCI
+       help
+         This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
+         devices.
+

 config QLGE
        tristate "QLogic QLGE 10Gb Ethernet Driver Support"
        depends on PCI
 config QLGE
        tristate "QLogic QLGE 10Gb Ethernet Driver Support"
        depends on PCI


@@ -3209,4 +3286,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