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 43a5254..5ce7cba 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1001,7 +1001,7 @@ config SMC911X
 
 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
@@ -1723,6 +1723,21 @@ config TLAN
 
          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
@@ -1859,8 +1874,8 @@ config 68360_ENET
          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.
@@ -1881,7 +1896,7 @@ config FEC_MPC52xx
        ---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"
@@ -1893,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.
-         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"
@@ -2201,7 +2216,7 @@ config SKGE_DEBUG
        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.
@@ -2227,7 +2242,7 @@ config SKY2_DEBUG
        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.
@@ -2265,6 +2280,18 @@ config BNX2
          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)
@@ -2426,6 +2453,17 @@ config 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
 
 #
@@ -2720,6 +2758,8 @@ source "drivers/net/wan/Kconfig"
 
 source "drivers/atm/Kconfig"
 
+source "drivers/ieee802154/Kconfig"
+
 source "drivers/s390/net/Kconfig"
 
 config XEN_NETDEV_FRONTEND