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 f19018d..6c521b4 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -209,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


@@ -975,7 +975,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


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

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


@@ -1723,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


@@ -1761,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


@@ -1860,7 +1883,7 @@ 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

        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.


@@ -1881,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"


@@ -1893,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"


@@ -1913,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


@@ -2201,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.


@@ -2227,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.


@@ -2265,6 +2303,18 @@ config BNX2
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
 
          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)


@@ -2294,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


@@ -2306,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


@@ -2342,10 +2394,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


@@ -2426,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
 
 #


@@ -2637,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.


@@ -2686,6 +2748,7 @@ 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
        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module


@@ -2720,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


@@ -3171,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