Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6

[~andy/linux] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a6a441b969fdda06df05da14a46c7d9b1582ab31..96f14ab1c1f52f805e64c62959fadc84d1b1e412 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
@@ -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
@@ -1738,11 +1738,18 @@ config 68360_ENET
          the Motorola 68360 processor.
 
 config FEC
-       bool "FEC ethernet controller (of ColdFire 5272)"
-       depends on M5272 || M5282
+       bool "FEC ethernet controller (of ColdFire CPUs)"
+       depends on M523x || M527x || M5272 || M528x
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
-         controller on the Motorola ColdFire 5272 processor.
+         controller on some Motorola ColdFire processors.
+
+config FEC2
+       bool "Second FEC ethernet controller (on some ColdFire CPUs)"
+       depends on FEC
+       help
+         Say Y here if you want to use the second built-in 10/100 Fast
+         ethernet controller on some Motorola ColdFire processors.
 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
@@ -1923,6 +1930,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
@@ -1930,7 +1951,7 @@ config SKGE
        ---help---
          This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
          and related Gigabit Ethernet adapters. It is a new smaller driver
-         driver with better performance and more complete ethtool support.
+         with better performance and more complete ethtool support.
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
@@ -2044,6 +2065,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