1 files changed, 42 insertions, 2 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 79e8aa6f2b9e..6bb9232514b4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -397,7 +397,7 @@ config SUN3LANCE
           If you're not building a kernel for a Sun 3, say N.
 
 config SUN3_82586
-        tristate "Sun3 on-board Intel 82586 support"
+        bool "Sun3 on-board Intel 82586 support"
         depends on NET_ETHERNET && SUN3
         help
           This driver enables support for the on-board Intel 82586 based
@@ -447,7 +447,7 @@ config NET_SB1250_MAC
 
 config SGI_IOC3_ETH
         bool "SGI IOC3 Ethernet"
-        depends on NET_ETHERNET && PCI && SGI_IP27
+        depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN
         select CRC32
         select MII
         help
@@ -1923,6 +1923,20 @@ config R8169_VLAN
           
           If in doubt, say Y.
 
+config SIS190
+        tristate "SiS190/SiS191 gigabit ethernet support"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+          a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+          appear in lan on motherboard designs which are based on SiS 965
+          and SiS 966 south bridge.
+
+          To compile this driver as a module, choose M here: the module
+          will be called sis190.  This is recommended.
+
 config SKGE
         tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
         depends on PCI && EXPERIMENTAL
@@ -2044,6 +2058,13 @@ config BNX2
           To compile this driver as a module, choose M here: the module
           will be called bnx2.  This is recommended.
 
+config SPIDER_NET
+        tristate "Spider Gigabit Ethernet driver"
+        depends on PCI && PPC_BPA
+        help
+          This driver supports the Gigabit Ethernet chips present on the
+          Cell Processor-Based Blades from IBM.
+
 config GIANFAR
         tristate "Gianfar Ethernet"
         depends on 85xx || 83xx
@@ -2093,6 +2114,25 @@ endmenu
 menu "Ethernet (10000 Mbit)"
         depends on !UML
 
+config CHELSIO_T1
+        tristate "Chelsio 10Gb Ethernet support"
+        depends on PCI
+        help
+          This driver supports Chelsio N110 and N210 models 10Gb Ethernet
+          cards. More information about adapter features and performance
+          tuning is in <file:Documentation/networking/cxgb.txt>.
+
+          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 cxgb.
+
 config IXGB
         tristate "Intel(R) PRO/10GbE support"
         depends on PCI