diff options
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index aa633fa95e64..d4d8e5f9ebf1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -66,7 +66,7 @@ config BONDING | |||
66 | 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux. | 66 | 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux. |
67 | 67 | ||
68 | The driver supports multiple bonding modes to allow for both high | 68 | The driver supports multiple bonding modes to allow for both high |
69 | perfomance and high availability operation. | 69 | performance and high availability operation. |
70 | 70 | ||
71 | Refer to <file:Documentation/networking/bonding.txt> for more | 71 | Refer to <file:Documentation/networking/bonding.txt> for more |
72 | information. | 72 | information. |
@@ -698,8 +698,8 @@ config VORTEX | |||
698 | depends on NET_VENDOR_3COM && (PCI || EISA) | 698 | depends on NET_VENDOR_3COM && (PCI || EISA) |
699 | select MII | 699 | select MII |
700 | ---help--- | 700 | ---help--- |
701 | This option enables driver support for a large number of 10mbps and | 701 | This option enables driver support for a large number of 10Mbps and |
702 | 10/100mbps EISA, PCI and PCMCIA 3Com network cards: | 702 | 10/100Mbps EISA, PCI and PCMCIA 3Com network cards: |
703 | 703 | ||
704 | "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI | 704 | "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI |
705 | "Boomerang" (EtherLink XL 3c900 or 3c905) PCI | 705 | "Boomerang" (EtherLink XL 3c900 or 3c905) PCI |
@@ -1021,7 +1021,7 @@ config EEXPRESS_PRO | |||
1021 | depends on NET_ISA | 1021 | depends on NET_ISA |
1022 | ---help--- | 1022 | ---help--- |
1023 | If you have a network (Ethernet) card of this type, say Y. This | 1023 | If you have a network (Ethernet) card of this type, say Y. This |
1024 | driver supports intel i82595{FX,TX} based boards. Note however | 1024 | driver supports Intel i82595{FX,TX} based boards. Note however |
1025 | that the EtherExpress PRO/100 Ethernet card has its own separate | 1025 | that the EtherExpress PRO/100 Ethernet card has its own separate |
1026 | driver. Please read the Ethernet-HOWTO, available from | 1026 | driver. Please read the Ethernet-HOWTO, available from |
1027 | <http://www.tldp.org/docs.html#howto>. | 1027 | <http://www.tldp.org/docs.html#howto>. |
@@ -1208,7 +1208,7 @@ config IBM_EMAC_RX_SKB_HEADROOM | |||
1208 | help | 1208 | help |
1209 | Additional receive skb headroom. Note, that driver | 1209 | Additional receive skb headroom. Note, that driver |
1210 | will always reserve at least 2 bytes to make IP header | 1210 | will always reserve at least 2 bytes to make IP header |
1211 | aligned, so usualy there is no need to add any additional | 1211 | aligned, so usually there is no need to add any additional |
1212 | headroom. | 1212 | headroom. |
1213 | 1213 | ||
1214 | If unsure, set to 0. | 1214 | If unsure, set to 0. |
@@ -1614,11 +1614,7 @@ config SIS900 | |||
1614 | ---help--- | 1614 | ---help--- |
1615 | This is a driver for the Fast Ethernet PCI network cards based on | 1615 | This is a driver for the Fast Ethernet PCI network cards based on |
1616 | the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in | 1616 | the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in |
1617 | SiS 630 and SiS 540 chipsets. If you have one of those, say Y and | 1617 | SiS 630 and SiS 540 chipsets. |
1618 | read the Ethernet-HOWTO, available at | ||
1619 | <http://www.tldp.org/docs.html#howto>. Please read | ||
1620 | <file:Documentation/networking/sis900.txt> and comments at the | ||
1621 | beginning of <file:drivers/net/sis900.c> for more information. | ||
1622 | 1618 | ||
1623 | This driver also supports AMD 79C901 HomePNA so that you can use | 1619 | This driver also supports AMD 79C901 HomePNA so that you can use |
1624 | your phone line as a network cable. | 1620 | your phone line as a network cable. |
@@ -1934,7 +1930,7 @@ config MYRI_SBUS | |||
1934 | will be called myri_sbus. This is recommended. | 1930 | will be called myri_sbus. This is recommended. |
1935 | 1931 | ||
1936 | config NS83820 | 1932 | config NS83820 |
1937 | tristate "National Semiconduct DP83820 support" | 1933 | tristate "National Semiconductor DP83820 support" |
1938 | depends on PCI | 1934 | depends on PCI |
1939 | help | 1935 | help |
1940 | This is a driver for the National Semiconductor DP83820 series | 1936 | This is a driver for the National Semiconductor DP83820 series |
@@ -2195,6 +2191,7 @@ config GFAR_NAPI | |||
2195 | config MV643XX_ETH | 2191 | config MV643XX_ETH |
2196 | tristate "MV-643XX Ethernet support" | 2192 | tristate "MV-643XX Ethernet support" |
2197 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM | 2193 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM |
2194 | select MII | ||
2198 | help | 2195 | help |
2199 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2196 | This driver supports the gigabit Ethernet on the Marvell MV643XX |
2200 | chipset which is used in the Momenco Ocelot C and Jaguar ATX and | 2197 | chipset which is used in the Momenco Ocelot C and Jaguar ATX and |
@@ -2514,7 +2511,7 @@ config PPP_FILTER | |||
2514 | Say Y here if you want to be able to filter the packets passing over | 2511 | Say Y here if you want to be able to filter the packets passing over |
2515 | PPP interfaces. This allows you to control which packets count as | 2512 | PPP interfaces. This allows you to control which packets count as |
2516 | activity (i.e. which packets will reset the idle timer or bring up | 2513 | activity (i.e. which packets will reset the idle timer or bring up |
2517 | a demand-dialled link) and which packets are to be dropped entirely. | 2514 | a demand-dialed link) and which packets are to be dropped entirely. |
2518 | You need to say Y here if you wish to use the pass-filter and | 2515 | You need to say Y here if you wish to use the pass-filter and |
2519 | active-filter options to pppd. | 2516 | active-filter options to pppd. |
2520 | 2517 | ||
@@ -2702,8 +2699,8 @@ config SHAPER | |||
2702 | <file:Documentation/networking/shaper.txt> for more information. | 2699 | <file:Documentation/networking/shaper.txt> for more information. |
2703 | 2700 | ||
2704 | An alternative to this traffic shaper is the experimental | 2701 | An alternative to this traffic shaper is the experimental |
2705 | Class-Based Queueing (CBQ) scheduling support which you get if you | 2702 | Class-Based Queuing (CBQ) scheduling support which you get if you |
2706 | say Y to "QoS and/or fair queueing" above. | 2703 | say Y to "QoS and/or fair queuing" above. |
2707 | 2704 | ||
2708 | To compile this driver as a module, choose M here: the module | 2705 | To compile this driver as a module, choose M here: the module |
2709 | will be called shaper. If unsure, say N. | 2706 | will be called shaper. If unsure, say N. |