Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fa9f76c953ddaf930ca929f05c1d3702bf4088c7..9a07ff7a7777dc6edabca5079a7d120591ab6a13 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3,6 +3,8 @@
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
        depends on NET
        bool "Network device support"
@@ -1320,7 +1322,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 +1490,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.
@@ -2547,3 +2549,4 @@ config NETCONSOLE
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
+endmenu