Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fa9f76c953dd..2b55687f6ee9 100644
--- 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.