[PATCH] USB: isp116x-hcd: support only per-port power switching

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d8bcb38797a1474b3daf70a9ab36df23557e045..6bb9232514b4e95a1b6506fe792e61a5f46779e5 100644 (file)
--- 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
@@ -1924,12 +1924,15 @@ config R8169_VLAN
          If in doubt, say Y.
 
 config SIS190
-       tristate "SiS190 gigabit ethernet support"
+       tristate "SiS190/SiS191 gigabit ethernet support"
        depends on PCI
        select CRC32
        select MII
        ---help---
-         Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter.
+         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.
@@ -2055,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