drivers/net: Add Micrel KS8841/42 support to ks8842 driver

[karo-tx-linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fe113d0e9456e9731527fef7d44eca6735a6f442..88294762f9e6c1e5eecece68467812dcb657e841 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -530,14 +530,15 @@ config SH_ETH
        depends on SUPERH && \
                (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
                 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
-                CPU_SUBTYPE_SH7724)
+                CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
        select CRC32
        select MII
        select MDIO_BITBANG
        select PHYLIB
        help
          Renesas SuperH Ethernet device driver.
-         This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.
+         This driver supporting CPUs are:
+               - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
 
 config SUNLANCE
        tristate "Sun LANCE support"
@@ -1749,11 +1750,12 @@ config TLAN
          Please email feedback to <torben.mathiasen@compaq.com>.
 
 config KS8842
-       tristate "Micrel KSZ8842"
+       tristate "Micrel KSZ8841/42 with generic bus interface"
        depends on HAS_IOMEM
        help
-         This platform driver is for Micrel KSZ8842 / KS8842
-         2-port ethernet switch chip (managed, VLAN, QoS).
+        This platform driver is for KSZ8841(1-port) / KS8842(2-port)
+        ethernet switch chip (managed, VLAN, QoS) from Micrel or
+        Timberdale(FPGA).
 
 config KS8851
        tristate "Micrel KS8851 SPI"
@@ -2602,6 +2604,29 @@ config CHELSIO_T4
          To compile this driver as a module choose M here; the module
          will be called cxgb4.
 
+config CHELSIO_T4VF_DEPENDS
+       tristate
+       depends on PCI && INET
+       default y
+
+config CHELSIO_T4VF
+       tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+       depends on CHELSIO_T4VF_DEPENDS
+       help
+         This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+         adapters with PCI-E SR-IOV Virtual Functions.
+
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
+
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.htm>.
+
+         Please send feedback to <linux-bugs@chelsio.com>.
+
+         To compile this driver as a module choose M here; the module
+         will be called cxgb4vf.
+
 config EHEA
        tristate "eHEA Ethernet support"
        depends on IBMEBUS && INET && SPARSEMEM
@@ -2615,7 +2640,6 @@ config EHEA
 config ENIC
        tristate "Cisco VIC Ethernet NIC Support"
        depends on PCI && INET
-       select INET_LRO
        help
          This enables the support for the Cisco VIC Ethernet card.
 
@@ -2755,6 +2779,7 @@ config MYRI10GE_DCA
 config NETXEN_NIC
        tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
        depends on PCI
+       select FW_LOADER
        help
          This enables the support for NetXen's Gigabit Ethernet card.
 
@@ -2820,6 +2845,7 @@ config BNX2X
 config QLCNIC
        tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
        depends on PCI
+       select FW_LOADER
        help
          This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
          devices.