IB/ehca: Make port autodetect mode the default

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 16899ee..5ce7cba 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,4 +1,3 @@
-

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


@@ -26,15 +25,6 @@ menuconfig NETDEVICES
 # that for each of the symbols.
 if NETDEVICES
 
 # that for each of the symbols.
 if NETDEVICES
 

-config COMPAT_NET_DEV_OPS
-       default y
-       bool "Enable older network device API compatiablity"
-       ---help---
-          This option enables kernel compatiability with older network devices
-          that do not use net_device_ops interface.
-
-         If unsure, say Y.
-

 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT


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


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


@@ -977,6 +978,8 @@ config ETHOC
        depends on NET_ETHERNET && HAS_IOMEM
        select MII
        select PHYLIB
        depends on NET_ETHERNET && HAS_IOMEM
        select MII
        select PHYLIB

+       select CRC32
+       select BITREVERSE

        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.
 


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

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


@@ -1720,6 +1723,21 @@ 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 VIA_RHINE
        tristate "VIA Rhine support"
        depends on NET_PCI && PCI
 config VIA_RHINE
        tristate "VIA Rhine support"
        depends on NET_PCI && PCI


@@ -1856,8 +1874,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

        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.


@@ -1878,7 +1896,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"


@@ -1890,7 +1908,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"


@@ -2056,6 +2074,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


@@ -2177,7 +2216,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.


@@ -2203,7 +2242,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.


@@ -2234,13 +2273,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)


@@ -2328,7 +2379,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
        tristate "Marvell Discovery (643XX) and Orion ethernet support"
 
 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
        select INET_LRO
        select PHYLIB
        help


@@ -2339,6 +2390,14 @@ 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 XILINX_LL_TEMAC
+       tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+       select PHYLIB
+       depends on PPC_DCR_NATIVE
+       help
+         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"
        depends on PCI
 config QLA3XXX
        tristate "QLogic QLA3XXX Network Driver Support"
        depends on PCI


@@ -2394,6 +2453,17 @@ 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.
+

 endif # NETDEV_1000
 
 #
 endif # NETDEV_1000
 
 #


@@ -2412,10 +2482,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


@@ -2448,6 +2522,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.


@@ -2483,6 +2558,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


@@ -2645,6 +2721,7 @@ 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
        help
        select ZLIB_INFLATE
        select LIBCRC32C
        help


@@ -2681,6 +2758,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