make bnx2x select ZLIB_INFLATE

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index eb75773..6cde4ed 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -136,10 +136,11 @@ config TUN
          If you don't know what to use this for, you don't need it.
 
 config VETH
          If you don't know what to use this for, you don't need it.
 
 config VETH

-       tristate "Virtual ethernet device"
+       tristate "Virtual ethernet pair device"

        ---help---
        ---help---

-         The device is an ethernet tunnel. Devices are created in pairs. When
-         one end receives the packet it appears on its pair and vice versa.
+         This device is a local ethernet tunnel. Devices are created in pairs.
+         When one end receives the packet it appears on its pair and vice
+         versa.

 
 config NET_SB1000
        tristate "General Instruments Surfboard 1000"
 
 config NET_SB1000
        tristate "General Instruments Surfboard 1000"


@@ -166,13 +167,14 @@ config NET_SB1000
          If you don't have this card, of course say N.
 
 config IP1000
          If you don't have this card, of course say N.
 
 config IP1000

-       tristate "IP1000 Gigabit Ethernet support"
-       depends on PCI && EXPERIMENTAL
-       ---help---
-         This driver supports IP1000 gigabit Ethernet cards.
+       tristate "IP1000 Gigabit Ethernet support"
+       depends on PCI && EXPERIMENTAL
+       select MII
+       ---help---
+         This driver supports IP1000 gigabit Ethernet cards.

 
 

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

 
 source "drivers/net/arcnet/Kconfig"
 
 
 source "drivers/net/arcnet/Kconfig"
 


@@ -233,7 +235,7 @@ source "drivers/net/arm/Kconfig"
 
 config AX88796
        tristate "ASIX AX88796 NE2000 clone support"
 
 config AX88796
        tristate "ASIX AX88796 NE2000 clone support"

-       depends on ARM || MIPS
+       depends on ARM || MIPS || SUPERH

        select CRC32
        select MII
        help
        select CRC32
        select MII
        help


@@ -364,8 +366,7 @@ config MAC89x0
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  This module will
+         To compile this driver as a module, choose M here. This module will

          be called mac89x0.
 
 config MACSONIC
          be called mac89x0.
 
 config MACSONIC


@@ -378,8 +379,7 @@ config MACSONIC
          one of these say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          one of these say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  This module will
+         To compile this driver as a module, choose M here. This module will

          be called macsonic.
 
 config MACMACE
          be called macsonic.
 
 config MACMACE


@@ -617,8 +617,7 @@ config EL1
          have problems.  Some people suggest to ping ("man ping") a nearby
          machine every minute ("man cron") when using this card.
 
          have problems.  Some people suggest to ping ("man ping") a nearby
          machine every minute ("man cron") when using this card.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c501.
 
 config EL2
          will be called 3c501.
 
 config EL2


@@ -630,8 +629,7 @@ config EL2
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c503.
 
 config ELPLUS
          will be called 3c503.
 
 config ELPLUS


@@ -643,8 +641,7 @@ config ELPLUS
          this type, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          this type, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c505.
 
 config EL16
          will be called 3c505.
 
 config EL16


@@ -655,8 +652,7 @@ config EL16
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c507.
 
 config EL3
          will be called 3c507.
 
 config EL3


@@ -671,8 +667,7 @@ config EL3
          setup disk to disable Plug & Play mode, and to select the default
          media type.
 
          setup disk to disable Plug & Play mode, and to select the default
          media type.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c509.
 
 config 3C515
          will be called 3c509.
 
 config 3C515


@@ -683,8 +678,7 @@ config 3C515
          network card, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          network card, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c515.
 
 config ELMC
          will be called 3c515.
 
 config ELMC


@@ -695,8 +689,7 @@ config ELMC
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c523.
 
 config ELMC_II
          will be called 3c523.
 
 config ELMC_II


@@ -707,8 +700,7 @@ config ELMC_II
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called 3c527.
 
 config VORTEX
          will be called 3c527.
 
 config VORTEX


@@ -731,8 +723,7 @@ config VORTEX
          <file:Documentation/networking/vortex.txt> and in the comments at
          the beginning of <file:drivers/net/3c59x.c>.
 
          <file:Documentation/networking/vortex.txt> and in the comments at
          the beginning of <file:drivers/net/3c59x.c>.
 

-         To compile this support as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.
+         To compile this support as a module, choose M here.

 
 config TYPHOON
        tristate "3cr990 series \"Typhoon\" support"
 
 config TYPHOON
        tristate "3cr990 series \"Typhoon\" support"


@@ -749,8 +740,7 @@ config TYPHOON
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called typhoon.
 
 config LANCE
          will be called typhoon.
 
 config LANCE


@@ -787,8 +777,7 @@ config WD80x3
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called wd.
 
 config ULTRAMCA
          will be called wd.
 
 config ULTRAMCA


@@ -800,8 +789,7 @@ config ULTRAMCA
          an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.
 
          an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called smc-mca.
 
 config ULTRA
          will be called smc-mca.
 
 config ULTRA


@@ -820,8 +808,7 @@ config ULTRA
          this but keep it in mind if you have such a SCSI card and have
          problems.
 
          this but keep it in mind if you have such a SCSI card and have
          problems.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called smc-ultra.
 
 config ULTRA32
          will be called smc-ultra.
 
 config ULTRA32


@@ -833,8 +820,7 @@ config ULTRA32
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called smc-ultra32.
 
 config BFIN_MAC
          will be called smc-ultra32.
 
 config BFIN_MAC


@@ -895,15 +881,14 @@ config SMC9194
          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.
 
          <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO,
          available from <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called smc9194.
 
 config SMC91X
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
          will be called smc9194.
 
 config SMC91X
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII

-       depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN
+       depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN

        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it


@@ -914,8 +899,7 @@ config SMC91X
          This driver is also available as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want).
          The module will be called smc91x.  If you want to compile it as a
          This driver is also available as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want).
          The module will be called smc91x.  If you want to compile it as a

-         module, say M here and read <file:Documentation/kbuild/modules.txt>
-         as well as <file:Documentation/networking/net-modules.txt>.
+         module, say M here and read <file:Documentation/kbuild/modules.txt>.

 
 config NET_NETX
        tristate "NetX Ethernet support"
 
 config NET_NETX
        tristate "NetX Ethernet support"


@@ -924,8 +908,7 @@ config NET_NETX
        help
          This is support for the Hilscher netX builtin Ethernet ports
 
        help
          This is support for the Hilscher netX builtin Ethernet ports
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called netx-eth.
 
 config DM9000
          will be called netx-eth.
 
 config DM9000


@@ -936,15 +919,14 @@ config DM9000
        ---help---
          Support for DM9000 chipset.
 
        ---help---
          Support for DM9000 chipset.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called dm9000.
+         To compile this driver as a module, choose M here.  The module
+         will be called dm9000.

 
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
 
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII

-       depends on ARCH_PXA || SUPERH
+       depends on ARCH_PXA || SH_MAGIC_PANEL_R2

        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.


@@ -978,8 +960,7 @@ config NI5010
          <http://www.tldp.org/docs.html#howto>. Note that this is still
          experimental code.
 
          <http://www.tldp.org/docs.html#howto>. Note that this is still
          experimental code.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ni5010.
 
 config NI52
          will be called ni5010.
 
 config NI52


@@ -990,8 +971,7 @@ config NI52
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ni52.
 
 config NI65
          will be called ni52.
 
 config NI65


@@ -1002,8 +982,7 @@ config NI65
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ni65.
 
 source "drivers/net/tulip/Kconfig"
          will be called ni65.
 
 source "drivers/net/tulip/Kconfig"


@@ -1017,8 +996,7 @@ config AT1700
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called at1700.
 
 config DEPCA
          will be called at1700.
 
 config DEPCA


@@ -1031,8 +1009,7 @@ config DEPCA
          <http://www.tldp.org/docs.html#howto> as well as
          <file:drivers/net/depca.c>.
 
          <http://www.tldp.org/docs.html#howto> as well as
          <file:drivers/net/depca.c>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called depca.
 
 config HP100
          will be called depca.
 
 config HP100


@@ -1043,8 +1020,7 @@ config HP100
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called hp100.
 
 config NET_ISA
          will be called hp100.
 
 config NET_ISA


@@ -1073,8 +1049,7 @@ config E2100
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called e2100.
 
 config EWRK3
          will be called e2100.
 
 config EWRK3


@@ -1088,8 +1063,7 @@ config EWRK3
          well as the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          well as the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ewrk3.
 
 config EEXPRESS
          will be called ewrk3.
 
 config EEXPRESS


@@ -1103,8 +1077,7 @@ config EEXPRESS
          because the driver was very unreliable. We now have a new driver
          that should do better.
 
          because the driver was very unreliable. We now have a new driver
          that should do better.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called eexpress.
 
 config EEXPRESS_PRO
          will be called eexpress.
 
 config EEXPRESS_PRO


@@ -1117,8 +1090,7 @@ config EEXPRESS_PRO
          driver.  Please read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          driver.  Please read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called eepro.
 
 config HPLAN_PLUS
          will be called eepro.
 
 config HPLAN_PLUS


@@ -1130,8 +1102,7 @@ config HPLAN_PLUS
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called hp-plus.
 
 config HPLAN
          will be called hp-plus.
 
 config HPLAN


@@ -1143,8 +1114,7 @@ config HPLAN
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called hp.
 
 config LP486E
          will be called hp.
 
 config LP486E


@@ -1163,8 +1133,7 @@ config ETH16I
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called eth16i.
 
 config NE2000
          will be called eth16i.
 
 config NE2000


@@ -1184,8 +1153,7 @@ config NE2000
          laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
          below.
 
          laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
          below.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ne.
 
 config ZNET
          will be called ne.
 
 config ZNET


@@ -1206,8 +1174,7 @@ config SEEQ8005
          is for you, read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          is for you, read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called seeq8005.
 
 config NE2_MCA
          will be called seeq8005.
 
 config NE2_MCA


@@ -1219,8 +1186,7 @@ config NE2_MCA
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ne2.
 
 config IBMLANA
          will be called ne2.
 
 config IBMLANA


@@ -1231,8 +1197,7 @@ config IBMLANA
          CONFIG_MCA to use this driver.  It is both available as an in-kernel
          driver and as a module.
 
          CONFIG_MCA to use this driver.  It is both available as an in-kernel
          driver and as a module.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The only
+         To compile this driver as a module, choose M here. The only

          currently supported card is the IBM LAN Adapter/A for Ethernet.  It
          will both support 16K and 32K memory windows, however a 32K window
          gives a better security against packet losses.  Usage of multiple
          currently supported card is the IBM LAN Adapter/A for Ethernet.  It
          will both support 16K and 32K memory windows, however a 32K window
          gives a better security against packet losses.  Usage of multiple


@@ -1246,8 +1211,7 @@ config IBMVETH
          This driver supports virtual ethernet adapters on newer IBM iSeries
          and pSeries systems.
 
          This driver supports virtual ethernet adapters on newer IBM iSeries
          and pSeries systems.
 

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

          be called ibmveth.
 
 source "drivers/net/ibm_emac/Kconfig"
          be called ibmveth.
 
 source "drivers/net/ibm_emac/Kconfig"


@@ -1277,8 +1241,7 @@ config PCNET32
          answer Y here and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          answer Y here and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called pcnet32.
 
 config PCNET32_NAPI
          will be called pcnet32.
 
 config PCNET32_NAPI


@@ -1305,8 +1268,7 @@ config AMD8111_ETH
          answer Y here and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          answer Y here and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called amd8111e.
 
 config AMD8111E_NAPI
          will be called amd8111e.
 
 config AMD8111E_NAPI


@@ -1360,8 +1322,7 @@ config AC3200
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called ac3200.
 
 config APRICOT
          will be called ac3200.
 
 config APRICOT


@@ -1372,9 +1333,8 @@ config APRICOT
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called apricot.
+         To compile this driver as a module, choose M here. The module
+         will be called apricot.

 
 config B44
        tristate "Broadcom 440x/47xx ethernet support"
 
 config B44
        tristate "Broadcom 440x/47xx ethernet support"


@@ -1386,9 +1346,8 @@ config B44
          or M and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          or M and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called b44.
+         To compile this driver as a module, choose M here. The module
+         will be called b44.

 
 # Auto-select SSB PCI-HOST support, if possible
 config B44_PCI_AUTOSELECT
 
 # Auto-select SSB PCI-HOST support, if possible
 config B44_PCI_AUTOSELECT


@@ -1417,9 +1376,8 @@ config FORCEDETH
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called forcedeth.
+         To compile this driver as a module, choose M here. The module
+         will be called forcedeth.

 
 config FORCEDETH_NAPI
        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
 
 config FORCEDETH_NAPI
        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"


@@ -1445,9 +1403,8 @@ config CS89x0
          <http://www.tldp.org/docs.html#howto> as well as
          <file:Documentation/networking/cs89x0.txt>.
 
          <http://www.tldp.org/docs.html#howto> as well as
          <file:Documentation/networking/cs89x0.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called cs89x0.
+         To compile this driver as a module, choose M here. The module
+         will be called cs89x0.

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


@@ -1463,8 +1420,7 @@ config EEPRO100
          card, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          card, say Y and read the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called eepro100.
 
 
          will be called eepro100.
 
 


@@ -1491,8 +1447,7 @@ config E100
          More specific information on configuring the driver is in 
          <file:Documentation/networking/e100.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/e100.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called e100.
 
 config LNE390
          will be called e100.
 
 config LNE390


@@ -1504,8 +1459,7 @@ config LNE390
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called lne390.
 
 config FEALNX
          will be called lne390.
 
 config FEALNX


@@ -1545,8 +1499,7 @@ config NE2K_PCI
          NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
          Holtek HT80232    Holtek HT80229
 
          NetVin NV5000SC   Via 86C926      SureCom NE34   Winbond
          Holtek HT80232    Holtek HT80229
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called ne2k-pci.
 
 config NE3210
          will be called ne2k-pci.
 
 config NE3210


@@ -1559,8 +1512,7 @@ config NE3210
          <http://www.tldp.org/docs.html#howto>.  Note that this driver
          will NOT WORK for NE3200 cards as they are completely different.
 
          <http://www.tldp.org/docs.html#howto>.  Note that this driver
          will NOT WORK for NE3200 cards as they are completely different.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called ne3210.
 
 config ES3210
          will be called ne3210.
 
 config ES3210


@@ -1572,8 +1524,7 @@ config ES3210
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called es3210.
 
 config 8139CP
          will be called es3210.
 
 config 8139CP


@@ -1703,8 +1654,7 @@ config TLAN
          Compaq NetFlex and Olicom cards.  Please read the file
          <file:Documentation/networking/tlan.txt> for more details.
 
          Compaq NetFlex and Olicom cards.  Please read the file
          <file:Documentation/networking/tlan.txt> for more details.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module
+         To compile this driver as a module, choose M here. The module

          will be called tlan.
 
          Please email feedback to <torben.mathiasen@compaq.com>.
          will be called tlan.
 
          Please email feedback to <torben.mathiasen@compaq.com>.


@@ -1880,6 +1830,28 @@ config FEC2
          Say Y here if you want to use the second built-in 10/100 Fast
          ethernet controller on some Motorola ColdFire processors.
 
          Say Y here if you want to use the second built-in 10/100 Fast
          ethernet controller on some Motorola ColdFire processors.
 

+config FEC_MPC52xx
+       tristate "MPC52xx FEC driver"
+       depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC
+       select CRC32
+       select PHYLIB
+       ---help---
+         This option enables support for the MPC5200's on-chip
+         Fast Ethernet Controller
+         If compiled as module, it will be called 'fec_mpc52xx.ko'.
+
+config FEC_MPC52xx_MDIO
+       bool "MPC52xx FEC MDIO bus driver"
+       depends on FEC_MPC52xx
+       default y
+       ---help---
+         The MPC5200's FEC can connect to the Ethernet either with
+         an external MII PHY chip or 10 Mbps 7-wire interface
+         (Motorola? industry standard).
+         If your board uses an external PHY connected to FEC, enable this.
+         If not sure, enable.
+         If compiled as module, it will be called 'fec_mpc52xx_phy.ko'.
+

 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
        depends on H8300
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
        depends on H8300


@@ -1972,8 +1944,7 @@ config E1000
          More specific information on configuring the driver is in 
          <file:Documentation/networking/e1000.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/e1000.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called e1000.
 
 config E1000_NAPI
          will be called e1000.
 
 config E1000_NAPI


@@ -2018,8 +1989,7 @@ config E1000E
          More specific information on configuring the driver is in
          <file:Documentation/networking/e1000e.txt>.
 
          More specific information on configuring the driver is in
          <file:Documentation/networking/e1000e.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called e1000e.
 
 source "drivers/net/ixp2000/Kconfig"
          will be called e1000e.
 
 source "drivers/net/ixp2000/Kconfig"


@@ -2052,8 +2022,7 @@ config HAMACHI
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          the Ethernet-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 

-         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. The module will be

          called hamachi.
 
 config YELLOWFIN
          called hamachi.
 
 config YELLOWFIN


@@ -2502,8 +2471,7 @@ config IXGBE
          More specific information on configuring the driver is in
          <file:Documentation/networking/ixgbe.txt>.
 
          More specific information on configuring the driver is in
          <file:Documentation/networking/ixgbe.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called ixgbe.
 
 config IXGB
          will be called ixgbe.
 
 config IXGB


@@ -2525,8 +2493,7 @@ config IXGB
          More specific information on configuring the driver is in 
          <file:Documentation/networking/ixgb.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/ixgb.txt>.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called ixgb.
 
 config IXGB_NAPI
          will be called ixgb.
 
 config IXGB_NAPI


@@ -2579,8 +2546,7 @@ config MYRI10GE
 
          <http://www.myri.com/scs/download-Myri10GE.html>
 
 
          <http://www.myri.com/scs/download-Myri10GE.html>
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module

          will be called myri10ge.
 
 config NETXEN_NIC
          will be called myri10ge.
 
 config NETXEN_NIC


@@ -2622,6 +2588,7 @@ config MLX4_DEBUG
 config TEHUTI
        tristate "Tehuti Networks 10G Ethernet"
        depends on PCI
 config TEHUTI
        tristate "Tehuti Networks 10G Ethernet"
        depends on PCI

+       select ZLIB_INFLATE

        help
          Tehuti Networks 10G Ethernet NIC
 
        help
          Tehuti Networks 10G Ethernet NIC
 


@@ -2804,10 +2771,9 @@ config PLIP
          with the PLIP support in Linux versions 1.0.x.  This option enlarges
          your kernel by about 8 KB.
 
          with the PLIP support in Linux versions 1.0.x.  This option enlarges
          your kernel by about 8 KB.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module will be
-         called plip.  If unsure, say Y or M, in case you buy a laptop
-         later.
+         To compile this driver as a module, choose M here. The module
+         will be called plip. If unsure, say Y or M, in case you buy
+         a laptop later.

 
 config PPP
        tristate "PPP (point-to-point protocol) support"
 
 config PPP
        tristate "PPP (point-to-point protocol) support"


@@ -2837,8 +2803,7 @@ config PPP
          If you said Y to "Version information on all symbols" above, then
          you cannot compile the PPP driver into the kernel; you can then only
          compile it as a module. To compile this driver as a module, choose M
          If you said Y to "Version information on all symbols" above, then
          you cannot compile the PPP driver into the kernel; you can then only
          compile it as a module. To compile this driver as a module, choose M

-         here and read <file:Documentation/networking/net-modules.txt>.
-         The module will be called ppp_generic.
+         here. The module will be called ppp_generic.

 
 config PPP_MULTILINK
        bool "PPP multilink support (EXPERIMENTAL)"
 
 config PPP_MULTILINK
        bool "PPP multilink support (EXPERIMENTAL)"


@@ -2999,9 +2964,8 @@ config SLIP
          <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
          support will enlarge your kernel by about 4 KB. If unsure, say N.
 
          <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP
          support will enlarge your kernel by about 4 KB. If unsure, say N.
 

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>. The module will be
-         called slip.
+         To compile this driver as a module, choose M here. The module
+         will be called slip.

 
 config SLIP_COMPRESSED
        bool "CSLIP compressed headers"
 
 config SLIP_COMPRESSED
        bool "CSLIP compressed headers"


@@ -3103,4 +3067,10 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
        def_bool NETPOLL
 
 config NET_POLL_CONTROLLER
        def_bool NETPOLL
 

+config VIRTIO_NET
+       tristate "Virtio network driver (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && VIRTIO
+       ---help---
+         This is the virtual network driver for lguest.  Say Y or M.
+

 endif # NETDEVICES
 endif # NETDEVICES