Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6

[pandora-kernel.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e2fa29b..47c72a6 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -4,9 +4,10 @@
 #
 
 menu "Network device support"
 #
 
 menu "Network device support"

+       depends on NET

 
 config NETDEVICES
 
 config NETDEVICES

-       depends on NET
+       default y if UML

        bool "Network device support"
        ---help---
          You can say N here if you don't intend to connect your Linux box to
        bool "Network device support"
        ---help---
          You can say N here if you don't intend to connect your Linux box to


@@ -23,9 +24,19 @@ config NETDEVICES
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

-# All the following symbols are dependent on NETDEVICES - do not repeat
-# that for each of the symbols.
-if NETDEVICES
+
+config IFB
+       tristate "Intermediate Functional Block support"
+       depends on NET_CLS_ACT
+       ---help---
+         This is an intermidiate driver that allows sharing of
+         resources.
+         To compile this driver as a module, choose M here: the module
+         will be called ifb.  If you want to use more than one ifb
+         device at a time, you need to compile this driver as a module.
+         Instead of 'ifb', the devices will then be called 'ifb0',
+         'ifb1' etc.
+         Look at the iproute2 documentation directory for usage etc

 
 config DUMMY
        tristate "Dummy net driver support"
 
 config DUMMY
        tristate "Dummy net driver support"


@@ -129,7 +140,7 @@ config NET_SB1000
 
          If you don't have this card, of course say N.
 
 
          If you don't have this card, of course say N.
 

-       source "drivers/net/arcnet/Kconfig"
+source "drivers/net/arcnet/Kconfig"

 
 source "drivers/net/phy/Kconfig"
 
 
 source "drivers/net/phy/Kconfig"
 


@@ -844,7 +855,7 @@ config SMC9194
 
 config DM9000
        tristate "DM9000 support"
 
 config DM9000
        tristate "DM9000 support"

-       depends on ARM && NET_ETHERNET
+       depends on (ARM || MIPS) && NET_ETHERNET

        select CRC32
        select MII
        ---help---
        select CRC32
        select MII
        ---help---


@@ -1374,7 +1385,7 @@ config FORCEDETH
 
 config CS89x0
        tristate "CS89x0 support"
 
 config CS89x0
        tristate "CS89x0 support"

-       depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105
+       depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)

        ---help---
          Support for CS89x0 chipset based Ethernet cards. If you have a
          network (Ethernet) card of this type, say Y and read the
        ---help---
          Support for CS89x0 chipset based Ethernet cards. If you have a
          network (Ethernet) card of this type, say Y and read the


@@ -1384,7 +1395,7 @@ config CS89x0
 
          To compile this driver as a module, choose M here and read
          <file:Documentation/networking/net-modules.txt>.  The module will be
 
          To compile this driver as a module, choose M here and read
          <file:Documentation/networking/net-modules.txt>.  The module will be

-         called cs89x.
+         called cs89x0.

 
 config TC35815
        tristate "TOSHIBA TC35815 Ethernet support"
 
 config TC35815
        tristate "TOSHIBA TC35815 Ethernet support"


@@ -1791,7 +1802,7 @@ config 68360_ENET
 
 config FEC
        bool "FEC ethernet controller (of ColdFire CPUs)"
 
 config FEC
        bool "FEC ethernet controller (of ColdFire CPUs)"

-       depends on M523x || M527x || M5272 || M528x
+       depends on M523x || M527x || M5272 || M528x || M520x

        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire processors.
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire processors.


@@ -1901,6 +1912,15 @@ config E1000_NAPI
 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

+config E1000_DISABLE_PACKET_SPLIT
+       bool "Disable Packet Split for PCI express adapters"
+       depends on E1000
+       help
+         Say Y here if you want to use the legacy receive path for PCI express
+         hadware.
+
+         If in doubt, say N.
+

 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS


@@ -2011,13 +2031,28 @@ config SKGE
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
 

+         This driver supports adapters based on the original Yukon chipset:
+         Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
+         Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
+
+         It does not support the newer Yukon2 chipset: a separate driver,
+         sky2, is provided for Yukon2-based adapters.
+
+         To compile this driver as a module, choose M here: the module
+         will be called skge.  This is recommended.

 
 config SKY2
        tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL
        select CRC32
        ---help---
 
 config SKY2
        tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL
        select CRC32
        ---help---

-         This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+         This driver supports Gigabit Ethernet adapters based on the the
+         Marvell Yukon 2 chipset:
+         Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+         88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+         This driver does not support the original Yukon chipset: a seperate
+         driver, skge, is provided for Yukon-based adapters.

 
          To compile this driver as a module, choose M here: the module
          will be called sky2.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called sky2.  This is recommended.


@@ -2027,8 +2062,15 @@ config SK98LIN
        depends on PCI
        ---help---
          Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
        depends on PCI
        ---help---
          Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx

-         compliant Gigabit Ethernet Adapter. The following adapters are supported
-         by this driver:
+         compliant Gigabit Ethernet Adapter.
+
+         This driver supports the original Yukon chipset. A cleaner driver is 
+         also available (skge) which seems to work better than this one.
+
+         This driver does not support the newer Yukon2 chipset. A seperate
+         driver, sky2, is provided to support Yukon2-based adapters.
+
+         The following adapters are supported by this driver:

            - 3Com 3C940 Gigabit LOM Ethernet Adapter
            - 3Com 3C941 Gigabit LOM Ethernet Adapter
            - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
            - 3Com 3C940 Gigabit LOM Ethernet Adapter
            - 3Com 3C941 Gigabit LOM Ethernet Adapter
            - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter


@@ -2663,10 +2705,6 @@ config SHAPER
          Class-Based Queueing (CBQ) scheduling support which you get if you
          say Y to "QoS and/or fair queueing" above.
 
          Class-Based Queueing (CBQ) scheduling support which you get if you
          say Y to "QoS and/or fair queueing" above.
 

-         To set up and configure shaper devices, you need the shapecfg
-         program, available from <ftp://shadow.cabi.net/pub/Linux/> in the
-         shaper package.
-

          To compile this driver as a module, choose M here: the module
          will be called shaper.  If unsure, say N.
 
          To compile this driver as a module, choose M here: the module
          will be called shaper.  If unsure, say N.
 


@@ -2677,8 +2715,6 @@ config NETCONSOLE
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 
        If you want to log kernel messages over the network, enable this.
        See <file:Documentation/networking/netconsole.txt> for details.
 

-endif #NETDEVICES
-

 config NETPOLL
        def_bool NETCONSOLE
 
 config NETPOLL
        def_bool NETCONSOLE