diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2005-07-27 16:04:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-27 16:04:35 -0400 |
commit | cbcd2a4cca1a6223e4f98661ef524919d322675e (patch) | |
tree | 555f2e6e4eb777a9a507ee81763010a8686634ab | |
parent | eaa1c5d05947819643b2e72cbfc51ae2ddcf1991 (diff) |
[NET]: Improve presentation of networking driver families.
Suggestion from Sam Ravnborg <sam@ravnborg.org>
It causes all driver families to be displayed aligned immediately under the
main network drivers heading (in menuconfig/xconfig/gconfig) instead of
not being subordinate to (i.e., not indented) the Network device support
heading at all.
The improved network driver families are:
token ring, wireless, PCMCIA, WAN, ATM, and S390.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/Kconfig | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 534b598866b3..51ef8a0f750a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -23,9 +23,12 @@ config NETDEVICES | |||
23 | 23 | ||
24 | If unsure, say Y. | 24 | If unsure, say Y. |
25 | 25 | ||
26 | # All the following symbols are dependent on NETDEVICES - do not repeat | ||
27 | # that for each of the symbols. | ||
28 | if NETDEVICES | ||
29 | |||
26 | config DUMMY | 30 | config DUMMY |
27 | tristate "Dummy net driver support" | 31 | tristate "Dummy net driver support" |
28 | depends on NETDEVICES | ||
29 | ---help--- | 32 | ---help--- |
30 | This is essentially a bit-bucket device (i.e. traffic you send to | 33 | This is essentially a bit-bucket device (i.e. traffic you send to |
31 | this device is consigned into oblivion) with a configurable IP | 34 | this device is consigned into oblivion) with a configurable IP |
@@ -45,7 +48,6 @@ config DUMMY | |||
45 | 48 | ||
46 | config BONDING | 49 | config BONDING |
47 | tristate "Bonding driver support" | 50 | tristate "Bonding driver support" |
48 | depends on NETDEVICES | ||
49 | depends on INET | 51 | depends on INET |
50 | ---help--- | 52 | ---help--- |
51 | Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet | 53 | Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet |
@@ -63,7 +65,6 @@ config BONDING | |||
63 | 65 | ||
64 | config EQUALIZER | 66 | config EQUALIZER |
65 | tristate "EQL (serial line load balancing) support" | 67 | tristate "EQL (serial line load balancing) support" |
66 | depends on NETDEVICES | ||
67 | ---help--- | 68 | ---help--- |
68 | If you have two serial connections to some other computer (this | 69 | If you have two serial connections to some other computer (this |
69 | usually requires two modems and two telephone lines) and you use | 70 | usually requires two modems and two telephone lines) and you use |
@@ -83,7 +84,6 @@ config EQUALIZER | |||
83 | 84 | ||
84 | config TUN | 85 | config TUN |
85 | tristate "Universal TUN/TAP device driver support" | 86 | tristate "Universal TUN/TAP device driver support" |
86 | depends on NETDEVICES | ||
87 | select CRC32 | 87 | select CRC32 |
88 | ---help--- | 88 | ---help--- |
89 | TUN/TAP provides packet reception and transmission for user space | 89 | TUN/TAP provides packet reception and transmission for user space |
@@ -107,7 +107,7 @@ config TUN | |||
107 | 107 | ||
108 | config NET_SB1000 | 108 | config NET_SB1000 |
109 | tristate "General Instruments Surfboard 1000" | 109 | tristate "General Instruments Surfboard 1000" |
110 | depends on NETDEVICES && PNP | 110 | depends on PNP |
111 | ---help--- | 111 | ---help--- |
112 | This is a driver for the General Instrument (also known as | 112 | This is a driver for the General Instrument (also known as |
113 | NextLevel) SURFboard 1000 internal | 113 | NextLevel) SURFboard 1000 internal |
@@ -129,16 +129,14 @@ config NET_SB1000 | |||
129 | 129 | ||
130 | If you don't have this card, of course say N. | 130 | If you don't have this card, of course say N. |
131 | 131 | ||
132 | if NETDEVICES | ||
133 | source "drivers/net/arcnet/Kconfig" | 132 | source "drivers/net/arcnet/Kconfig" |
134 | endif | ||
135 | 133 | ||
136 | # | 134 | # |
137 | # Ethernet | 135 | # Ethernet |
138 | # | 136 | # |
139 | 137 | ||
140 | menu "Ethernet (10 or 100Mbit)" | 138 | menu "Ethernet (10 or 100Mbit)" |
141 | depends on NETDEVICES && !UML | 139 | depends on !UML |
142 | 140 | ||
143 | config NET_ETHERNET | 141 | config NET_ETHERNET |
144 | bool "Ethernet (10 or 100Mbit)" | 142 | bool "Ethernet (10 or 100Mbit)" |
@@ -1137,7 +1135,7 @@ config IBMLANA | |||
1137 | 1135 | ||
1138 | config IBMVETH | 1136 | config IBMVETH |
1139 | tristate "IBM LAN Virtual Ethernet support" | 1137 | tristate "IBM LAN Virtual Ethernet support" |
1140 | depends on NETDEVICES && NET_ETHERNET && PPC_PSERIES | 1138 | depends on NET_ETHERNET && PPC_PSERIES |
1141 | ---help--- | 1139 | ---help--- |
1142 | This driver supports virtual ethernet adapters on newer IBM iSeries | 1140 | This driver supports virtual ethernet adapters on newer IBM iSeries |
1143 | and pSeries systems. | 1141 | and pSeries systems. |
@@ -1760,7 +1758,7 @@ endmenu | |||
1760 | # | 1758 | # |
1761 | 1759 | ||
1762 | menu "Ethernet (1000 Mbit)" | 1760 | menu "Ethernet (1000 Mbit)" |
1763 | depends on NETDEVICES && !UML | 1761 | depends on !UML |
1764 | 1762 | ||
1765 | config ACENIC | 1763 | config ACENIC |
1766 | tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" | 1764 | tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" |
@@ -2091,7 +2089,7 @@ endmenu | |||
2091 | # | 2089 | # |
2092 | 2090 | ||
2093 | menu "Ethernet (10000 Mbit)" | 2091 | menu "Ethernet (10000 Mbit)" |
2094 | depends on NETDEVICES && !UML | 2092 | depends on !UML |
2095 | 2093 | ||
2096 | config IXGB | 2094 | config IXGB |
2097 | tristate "Intel(R) PRO/10GbE support" | 2095 | tristate "Intel(R) PRO/10GbE support" |
@@ -2186,11 +2184,11 @@ source "drivers/s390/net/Kconfig" | |||
2186 | 2184 | ||
2187 | config ISERIES_VETH | 2185 | config ISERIES_VETH |
2188 | tristate "iSeries Virtual Ethernet driver support" | 2186 | tristate "iSeries Virtual Ethernet driver support" |
2189 | depends on NETDEVICES && PPC_ISERIES | 2187 | depends on PPC_ISERIES |
2190 | 2188 | ||
2191 | config FDDI | 2189 | config FDDI |
2192 | bool "FDDI driver support" | 2190 | bool "FDDI driver support" |
2193 | depends on NETDEVICES && (PCI || EISA) | 2191 | depends on (PCI || EISA) |
2194 | help | 2192 | help |
2195 | Fiber Distributed Data Interface is a high speed local area network | 2193 | Fiber Distributed Data Interface is a high speed local area network |
2196 | design; essentially a replacement for high speed Ethernet. FDDI can | 2194 | design; essentially a replacement for high speed Ethernet. FDDI can |
@@ -2239,7 +2237,7 @@ config SKFP | |||
2239 | 2237 | ||
2240 | config HIPPI | 2238 | config HIPPI |
2241 | bool "HIPPI driver support (EXPERIMENTAL)" | 2239 | bool "HIPPI driver support (EXPERIMENTAL)" |
2242 | depends on NETDEVICES && EXPERIMENTAL && INET && PCI | 2240 | depends on EXPERIMENTAL && INET && PCI |
2243 | help | 2241 | help |
2244 | HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and | 2242 | HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and |
2245 | 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI | 2243 | 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI |
@@ -2271,7 +2269,7 @@ config ROADRUNNER_LARGE_RINGS | |||
2271 | 2269 | ||
2272 | config PLIP | 2270 | config PLIP |
2273 | tristate "PLIP (parallel port) support" | 2271 | tristate "PLIP (parallel port) support" |
2274 | depends on NETDEVICES && PARPORT | 2272 | depends on PARPORT |
2275 | ---help--- | 2273 | ---help--- |
2276 | PLIP (Parallel Line Internet Protocol) is used to create a | 2274 | PLIP (Parallel Line Internet Protocol) is used to create a |
2277 | reasonably fast mini network consisting of two (or, rarely, more) | 2275 | reasonably fast mini network consisting of two (or, rarely, more) |
@@ -2307,7 +2305,6 @@ config PLIP | |||
2307 | 2305 | ||
2308 | config PPP | 2306 | config PPP |
2309 | tristate "PPP (point-to-point protocol) support" | 2307 | tristate "PPP (point-to-point protocol) support" |
2310 | depends on NETDEVICES | ||
2311 | ---help--- | 2308 | ---help--- |
2312 | PPP (Point to Point Protocol) is a newer and better SLIP. It serves | 2309 | PPP (Point to Point Protocol) is a newer and better SLIP. It serves |
2313 | the same purpose: sending Internet traffic over telephone (and other | 2310 | the same purpose: sending Internet traffic over telephone (and other |
@@ -2443,7 +2440,6 @@ config PPPOATM | |||
2443 | 2440 | ||
2444 | config SLIP | 2441 | config SLIP |
2445 | tristate "SLIP (serial line) support" | 2442 | tristate "SLIP (serial line) support" |
2446 | depends on NETDEVICES | ||
2447 | ---help--- | 2443 | ---help--- |
2448 | Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to | 2444 | Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to |
2449 | connect to your Internet service provider or to connect to some | 2445 | connect to your Internet service provider or to connect to some |
@@ -2510,7 +2506,7 @@ config SLIP_MODE_SLIP6 | |||
2510 | 2506 | ||
2511 | config NET_FC | 2507 | config NET_FC |
2512 | bool "Fibre Channel driver support" | 2508 | bool "Fibre Channel driver support" |
2513 | depends on NETDEVICES && SCSI && PCI | 2509 | depends on SCSI && PCI |
2514 | help | 2510 | help |
2515 | Fibre Channel is a high speed serial protocol mainly used to connect | 2511 | Fibre Channel is a high speed serial protocol mainly used to connect |
2516 | large storage devices to the computer; it is compatible with and | 2512 | large storage devices to the computer; it is compatible with and |
@@ -2523,7 +2519,7 @@ config NET_FC | |||
2523 | 2519 | ||
2524 | config SHAPER | 2520 | config SHAPER |
2525 | tristate "Traffic Shaper (EXPERIMENTAL)" | 2521 | tristate "Traffic Shaper (EXPERIMENTAL)" |
2526 | depends on NETDEVICES && EXPERIMENTAL | 2522 | depends on EXPERIMENTAL |
2527 | ---help--- | 2523 | ---help--- |
2528 | The traffic shaper is a virtual network device that allows you to | 2524 | The traffic shaper is a virtual network device that allows you to |
2529 | limit the rate of outgoing data flow over some other network device. | 2525 | limit the rate of outgoing data flow over some other network device. |
@@ -2544,11 +2540,13 @@ config SHAPER | |||
2544 | 2540 | ||
2545 | config NETCONSOLE | 2541 | config NETCONSOLE |
2546 | tristate "Network console logging support (EXPERIMENTAL)" | 2542 | tristate "Network console logging support (EXPERIMENTAL)" |
2547 | depends on NETDEVICES && INET && EXPERIMENTAL | 2543 | depends on INET && EXPERIMENTAL |
2548 | ---help--- | 2544 | ---help--- |
2549 | If you want to log kernel messages over the network, enable this. | 2545 | If you want to log kernel messages over the network, enable this. |
2550 | See <file:Documentation/networking/netconsole.txt> for details. | 2546 | See <file:Documentation/networking/netconsole.txt> for details. |
2551 | 2547 | ||
2548 | endif #NETDEVICES | ||
2549 | |||
2552 | config NETPOLL | 2550 | config NETPOLL |
2553 | def_bool NETCONSOLE | 2551 | def_bool NETCONSOLE |
2554 | 2552 | ||