[PATCH] pcmcia: id_table for 3c574_cs

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 60e3b968553ae4762e6ad46473e9a9b23470af21..2b55687f6ee9d678a468f7a1ffdb632a5b865694 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1320,7 +1320,7 @@ config FORCEDETH
 
 config CS89x0
        tristate "CS89x0 support"
-       depends on NET_PCI && (ISA || ARCH_IXDP2X01)
+       depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105
        ---help---
          Support for CS89x0 chipset based Ethernet cards. If you have a
          network (Ethernet) card of this type, say Y and read the
@@ -1488,14 +1488,14 @@ config 8139CP
          will be called 8139cp.  This is recommended.
 
 config 8139TOO
-       tristate "RealTek RTL-8139 PCI Fast Ethernet Adapter support"
+       tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
        select CRC32
        select MII
        ---help---
          This is a driver for the Fast Ethernet PCI network cards based on
-         the RTL8139 chips. If you have one of those, say Y and read
-         the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
+         the RTL 8129/8130/8139 chips. If you have one of those, say Y and
+         read the Ethernet-HOWTO <http://www.tldp.org/docs.html#howto>.
 
          To compile this driver as a module, choose M here: the module
          will be called 8139too.  This is recommended.
@@ -1921,6 +1921,18 @@ config R8169_VLAN
          
          If in doubt, say Y.
 
+config SKGE
+       tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       ---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.
+
+         It does not support the link failover and network management 
+         features that "portable" vendor supplied sk98lin driver does.
+       
 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI