aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@computergmbh.de>2007-10-17 02:30:15 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:00 -0400
commita77b645609084c030020bc58639d92da4316f410 (patch)
tree7263f60329c8b288a96c755710c7a8b6e91bf28a
parent2d1df8153c5d38a8bf5e47fa755a117e5731d24c (diff)
menuconfig: transform NLS and DLM menus
Changes NLS and DLM menus into a 'menuconfig' object so that it can be disabled at once without having to enter the menu first to disable the config option. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/dlm/Kconfig8
-rw-r--r--fs/nls/Kconfig50
2 files changed, 7 insertions, 51 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 54bcc00ec8df..2dbb422e8116 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,8 +1,6 @@
1menu "Distributed Lock Manager" 1menuconfig DLM
2 depends on EXPERIMENTAL && INET
3
4config DLM
5 tristate "Distributed Lock Manager (DLM)" 2 tristate "Distributed Lock Manager (DLM)"
3 depends on EXPERIMENTAL && INET
6 depends on SYSFS && (IPV6 || IPV6=n) 4 depends on SYSFS && (IPV6 || IPV6=n)
7 select CONFIGFS_FS 5 select CONFIGFS_FS
8 select IP_SCTP 6 select IP_SCTP
@@ -17,5 +15,3 @@ config DLM_DEBUG
17 Under the debugfs mount point, the name of each lockspace will 15 Under the debugfs mount point, the name of each lockspace will
18 appear as a file in the "dlm" directory. The output is the 16 appear as a file in the "dlm" directory. The output is the
19 list of resource and locks the local node knows about. 17 list of resource and locks the local node knows about.
20
21endmenu
diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig
index 976ecccd6f56..a39edc41becc 100644
--- a/fs/nls/Kconfig
+++ b/fs/nls/Kconfig
@@ -2,10 +2,8 @@
2# Native language support configuration 2# Native language support configuration
3# 3#
4 4
5menu "Native Language Support" 5menuconfig NLS
6 6 tristate "Native language support"
7config NLS
8 tristate "Base native language support"
9 ---help--- 7 ---help---
10 The base Native Language Support. A number of filesystems 8 The base Native Language Support. A number of filesystems
11 depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well 9 depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
@@ -17,9 +15,10 @@ config NLS
17 To compile this code as a module, choose M here: the module 15 To compile this code as a module, choose M here: the module
18 will be called nls_base. 16 will be called nls_base.
19 17
18if NLS
19
20config NLS_DEFAULT 20config NLS_DEFAULT
21 string "Default NLS Option" 21 string "Default NLS Option"
22 depends on NLS
23 default "iso8859-1" 22 default "iso8859-1"
24 ---help--- 23 ---help---
25 The default NLS used when mounting file system. Note, that this is 24 The default NLS used when mounting file system. Note, that this is
@@ -39,7 +38,6 @@ config NLS_DEFAULT
39 38
40config NLS_CODEPAGE_437 39config NLS_CODEPAGE_437
41 tristate "Codepage 437 (United States, Canada)" 40 tristate "Codepage 437 (United States, Canada)"
42 depends on NLS
43 help 41 help
44 The Microsoft FAT file system family can deal with filenames in 42 The Microsoft FAT file system family can deal with filenames in
45 native language character sets. These character sets are stored 43 native language character sets. These character sets are stored
@@ -52,7 +50,6 @@ config NLS_CODEPAGE_437
52 50
53config NLS_CODEPAGE_737 51config NLS_CODEPAGE_737
54 tristate "Codepage 737 (Greek)" 52 tristate "Codepage 737 (Greek)"
55 depends on NLS
56 help 53 help
57 The Microsoft FAT file system family can deal with filenames in 54 The Microsoft FAT file system family can deal with filenames in
58 native language character sets. These character sets are stored 55 native language character sets. These character sets are stored
@@ -65,7 +62,6 @@ config NLS_CODEPAGE_737
65 62
66config NLS_CODEPAGE_775 63config NLS_CODEPAGE_775
67 tristate "Codepage 775 (Baltic Rim)" 64 tristate "Codepage 775 (Baltic Rim)"
68 depends on NLS
69 help 65 help
70 The Microsoft FAT file system family can deal with filenames in 66 The Microsoft FAT file system family can deal with filenames in
71 native language character sets. These character sets are stored 67 native language character sets. These character sets are stored
@@ -79,7 +75,6 @@ config NLS_CODEPAGE_775
79 75
80config NLS_CODEPAGE_850 76config NLS_CODEPAGE_850
81 tristate "Codepage 850 (Europe)" 77 tristate "Codepage 850 (Europe)"
82 depends on NLS
83 ---help--- 78 ---help---
84 The Microsoft FAT file system family can deal with filenames in 79 The Microsoft FAT file system family can deal with filenames in
85 native language character sets. These character sets are stored in 80 native language character sets. These character sets are stored in
@@ -96,7 +91,6 @@ config NLS_CODEPAGE_850
96 91
97config NLS_CODEPAGE_852 92config NLS_CODEPAGE_852
98 tristate "Codepage 852 (Central/Eastern Europe)" 93 tristate "Codepage 852 (Central/Eastern Europe)"
99 depends on NLS
100 ---help--- 94 ---help---
101 The Microsoft FAT file system family can deal with filenames in 95 The Microsoft FAT file system family can deal with filenames in
102 native language character sets. These character sets are stored in 96 native language character sets. These character sets are stored in
@@ -112,7 +106,6 @@ config NLS_CODEPAGE_852
112 106
113config NLS_CODEPAGE_855 107config NLS_CODEPAGE_855
114 tristate "Codepage 855 (Cyrillic)" 108 tristate "Codepage 855 (Cyrillic)"
115 depends on NLS
116 help 109 help
117 The Microsoft FAT file system family can deal with filenames in 110 The Microsoft FAT file system family can deal with filenames in
118 native language character sets. These character sets are stored in 111 native language character sets. These character sets are stored in
@@ -124,7 +117,6 @@ config NLS_CODEPAGE_855
124 117
125config NLS_CODEPAGE_857 118config NLS_CODEPAGE_857
126 tristate "Codepage 857 (Turkish)" 119 tristate "Codepage 857 (Turkish)"
127 depends on NLS
128 help 120 help
129 The Microsoft FAT file system family can deal with filenames in 121 The Microsoft FAT file system family can deal with filenames in
130 native language character sets. These character sets are stored in 122 native language character sets. These character sets are stored in
@@ -136,7 +128,6 @@ config NLS_CODEPAGE_857
136 128
137config NLS_CODEPAGE_860 129config NLS_CODEPAGE_860
138 tristate "Codepage 860 (Portuguese)" 130 tristate "Codepage 860 (Portuguese)"
139 depends on NLS
140 help 131 help
141 The Microsoft FAT file system family can deal with filenames in 132 The Microsoft FAT file system family can deal with filenames in
142 native language character sets. These character sets are stored in 133 native language character sets. These character sets are stored in
@@ -148,7 +139,6 @@ config NLS_CODEPAGE_860
148 139
149config NLS_CODEPAGE_861 140config NLS_CODEPAGE_861
150 tristate "Codepage 861 (Icelandic)" 141 tristate "Codepage 861 (Icelandic)"
151 depends on NLS
152 help 142 help
153 The Microsoft FAT file system family can deal with filenames in 143 The Microsoft FAT file system family can deal with filenames in
154 native language character sets. These character sets are stored in 144 native language character sets. These character sets are stored in
@@ -160,7 +150,6 @@ config NLS_CODEPAGE_861
160 150
161config NLS_CODEPAGE_862 151config NLS_CODEPAGE_862
162 tristate "Codepage 862 (Hebrew)" 152 tristate "Codepage 862 (Hebrew)"
163 depends on NLS
164 help 153 help
165 The Microsoft FAT file system family can deal with filenames in 154 The Microsoft FAT file system family can deal with filenames in
166 native language character sets. These character sets are stored in 155 native language character sets. These character sets are stored in
@@ -172,7 +161,6 @@ config NLS_CODEPAGE_862
172 161
173config NLS_CODEPAGE_863 162config NLS_CODEPAGE_863
174 tristate "Codepage 863 (Canadian French)" 163 tristate "Codepage 863 (Canadian French)"
175 depends on NLS
176 help 164 help
177 The Microsoft FAT file system family can deal with filenames in 165 The Microsoft FAT file system family can deal with filenames in
178 native language character sets. These character sets are stored in 166 native language character sets. These character sets are stored in
@@ -185,7 +173,6 @@ config NLS_CODEPAGE_863
185 173
186config NLS_CODEPAGE_864 174config NLS_CODEPAGE_864
187 tristate "Codepage 864 (Arabic)" 175 tristate "Codepage 864 (Arabic)"
188 depends on NLS
189 help 176 help
190 The Microsoft FAT file system family can deal with filenames in 177 The Microsoft FAT file system family can deal with filenames in
191 native language character sets. These character sets are stored in 178 native language character sets. These character sets are stored in
@@ -197,7 +184,6 @@ config NLS_CODEPAGE_864
197 184
198config NLS_CODEPAGE_865 185config NLS_CODEPAGE_865
199 tristate "Codepage 865 (Norwegian, Danish)" 186 tristate "Codepage 865 (Norwegian, Danish)"
200 depends on NLS
201 help 187 help
202 The Microsoft FAT file system family can deal with filenames in 188 The Microsoft FAT file system family can deal with filenames in
203 native language character sets. These character sets are stored in 189 native language character sets. These character sets are stored in
@@ -210,7 +196,6 @@ config NLS_CODEPAGE_865
210 196
211config NLS_CODEPAGE_866 197config NLS_CODEPAGE_866
212 tristate "Codepage 866 (Cyrillic/Russian)" 198 tristate "Codepage 866 (Cyrillic/Russian)"
213 depends on NLS
214 help 199 help
215 The Microsoft FAT file system family can deal with filenames in 200 The Microsoft FAT file system family can deal with filenames in
216 native language character sets. These character sets are stored in 201 native language character sets. These character sets are stored in
@@ -223,7 +208,6 @@ config NLS_CODEPAGE_866
223 208
224config NLS_CODEPAGE_869 209config NLS_CODEPAGE_869
225 tristate "Codepage 869 (Greek)" 210 tristate "Codepage 869 (Greek)"
226 depends on NLS
227 help 211 help
228 The Microsoft FAT file system family can deal with filenames in 212 The Microsoft FAT file system family can deal with filenames in
229 native language character sets. These character sets are stored in 213 native language character sets. These character sets are stored in
@@ -235,7 +219,6 @@ config NLS_CODEPAGE_869
235 219
236config NLS_CODEPAGE_936 220config NLS_CODEPAGE_936
237 tristate "Simplified Chinese charset (CP936, GB2312)" 221 tristate "Simplified Chinese charset (CP936, GB2312)"
238 depends on NLS
239 help 222 help
240 The Microsoft FAT file system family can deal with filenames in 223 The Microsoft FAT file system family can deal with filenames in
241 native language character sets. These character sets are stored in 224 native language character sets. These character sets are stored in
@@ -248,7 +231,6 @@ config NLS_CODEPAGE_936
248 231
249config NLS_CODEPAGE_950 232config NLS_CODEPAGE_950
250 tristate "Traditional Chinese charset (Big5)" 233 tristate "Traditional Chinese charset (Big5)"
251 depends on NLS
252 help 234 help
253 The Microsoft FAT file system family can deal with filenames in 235 The Microsoft FAT file system family can deal with filenames in
254 native language character sets. These character sets are stored in 236 native language character sets. These character sets are stored in
@@ -261,7 +243,6 @@ config NLS_CODEPAGE_950
261 243
262config NLS_CODEPAGE_932 244config NLS_CODEPAGE_932
263 tristate "Japanese charsets (Shift-JIS, EUC-JP)" 245 tristate "Japanese charsets (Shift-JIS, EUC-JP)"
264 depends on NLS
265 help 246 help
266 The Microsoft FAT file system family can deal with filenames in 247 The Microsoft FAT file system family can deal with filenames in
267 native language character sets. These character sets are stored in 248 native language character sets. These character sets are stored in
@@ -275,7 +256,6 @@ config NLS_CODEPAGE_932
275 256
276config NLS_CODEPAGE_949 257config NLS_CODEPAGE_949
277 tristate "Korean charset (CP949, EUC-KR)" 258 tristate "Korean charset (CP949, EUC-KR)"
278 depends on NLS
279 help 259 help
280 The Microsoft FAT file system family can deal with filenames in 260 The Microsoft FAT file system family can deal with filenames in
281 native language character sets. These character sets are stored in 261 native language character sets. These character sets are stored in
@@ -287,7 +267,6 @@ config NLS_CODEPAGE_949
287 267
288config NLS_CODEPAGE_874 268config NLS_CODEPAGE_874
289 tristate "Thai charset (CP874, TIS-620)" 269 tristate "Thai charset (CP874, TIS-620)"
290 depends on NLS
291 help 270 help
292 The Microsoft FAT file system family can deal with filenames in 271 The Microsoft FAT file system family can deal with filenames in
293 native language character sets. These character sets are stored in 272 native language character sets. These character sets are stored in
@@ -299,7 +278,6 @@ config NLS_CODEPAGE_874
299 278
300config NLS_ISO8859_8 279config NLS_ISO8859_8
301 tristate "Hebrew charsets (ISO-8859-8, CP1255)" 280 tristate "Hebrew charsets (ISO-8859-8, CP1255)"
302 depends on NLS
303 help 281 help
304 If you want to display filenames with native language characters 282 If you want to display filenames with native language characters
305 from the Microsoft FAT file system family or from JOLIET CD-ROMs 283 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -309,7 +287,6 @@ config NLS_ISO8859_8
309 287
310config NLS_CODEPAGE_1250 288config NLS_CODEPAGE_1250
311 tristate "Windows CP1250 (Slavic/Central European Languages)" 289 tristate "Windows CP1250 (Slavic/Central European Languages)"
312 depends on NLS
313 help 290 help
314 If you want to display filenames with native language characters 291 If you want to display filenames with native language characters
315 from the Microsoft FAT file system family or from JOLIET CDROMs 292 from the Microsoft FAT file system family or from JOLIET CDROMs
@@ -321,7 +298,6 @@ config NLS_CODEPAGE_1250
321 298
322config NLS_CODEPAGE_1251 299config NLS_CODEPAGE_1251
323 tristate "Windows CP1251 (Bulgarian, Belarusian)" 300 tristate "Windows CP1251 (Bulgarian, Belarusian)"
324 depends on NLS
325 help 301 help
326 The Microsoft FAT file system family can deal with filenames in 302 The Microsoft FAT file system family can deal with filenames in
327 native language character sets. These character sets are stored in 303 native language character sets. These character sets are stored in
@@ -334,7 +310,6 @@ config NLS_CODEPAGE_1251
334 310
335config NLS_ASCII 311config NLS_ASCII
336 tristate "ASCII (United States)" 312 tristate "ASCII (United States)"
337 depends on NLS
338 help 313 help
339 An ASCII NLS module is needed if you want to override the 314 An ASCII NLS module is needed if you want to override the
340 DEFAULT NLS with this very basic charset and don't want any 315 DEFAULT NLS with this very basic charset and don't want any
@@ -342,7 +317,6 @@ config NLS_ASCII
342 317
343config NLS_ISO8859_1 318config NLS_ISO8859_1
344 tristate "NLS ISO 8859-1 (Latin 1; Western European Languages)" 319 tristate "NLS ISO 8859-1 (Latin 1; Western European Languages)"
345 depends on NLS
346 help 320 help
347 If you want to display filenames with native language characters 321 If you want to display filenames with native language characters
348 from the Microsoft FAT file system family or from JOLIET CD-ROMs 322 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -355,7 +329,6 @@ config NLS_ISO8859_1
355 329
356config NLS_ISO8859_2 330config NLS_ISO8859_2
357 tristate "NLS ISO 8859-2 (Latin 2; Slavic/Central European Languages)" 331 tristate "NLS ISO 8859-2 (Latin 2; Slavic/Central European Languages)"
358 depends on NLS
359 help 332 help
360 If you want to display filenames with native language characters 333 If you want to display filenames with native language characters
361 from the Microsoft FAT file system family or from JOLIET CD-ROMs 334 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -367,7 +340,6 @@ config NLS_ISO8859_2
367 340
368config NLS_ISO8859_3 341config NLS_ISO8859_3
369 tristate "NLS ISO 8859-3 (Latin 3; Esperanto, Galician, Maltese, Turkish)" 342 tristate "NLS ISO 8859-3 (Latin 3; Esperanto, Galician, Maltese, Turkish)"
370 depends on NLS
371 help 343 help
372 If you want to display filenames with native language characters 344 If you want to display filenames with native language characters
373 from the Microsoft FAT file system family or from JOLIET CD-ROMs 345 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -378,7 +350,6 @@ config NLS_ISO8859_3
378 350
379config NLS_ISO8859_4 351config NLS_ISO8859_4
380 tristate "NLS ISO 8859-4 (Latin 4; old Baltic charset)" 352 tristate "NLS ISO 8859-4 (Latin 4; old Baltic charset)"
381 depends on NLS
382 help 353 help
383 If you want to display filenames with native language characters 354 If you want to display filenames with native language characters
384 from the Microsoft FAT file system family or from JOLIET CD-ROMs 355 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -389,7 +360,6 @@ config NLS_ISO8859_4
389 360
390config NLS_ISO8859_5 361config NLS_ISO8859_5
391 tristate "NLS ISO 8859-5 (Cyrillic)" 362 tristate "NLS ISO 8859-5 (Cyrillic)"
392 depends on NLS
393 help 363 help
394 If you want to display filenames with native language characters 364 If you want to display filenames with native language characters
395 from the Microsoft FAT file system family or from JOLIET CD-ROMs 365 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -401,7 +371,6 @@ config NLS_ISO8859_5
401 371
402config NLS_ISO8859_6 372config NLS_ISO8859_6
403 tristate "NLS ISO 8859-6 (Arabic)" 373 tristate "NLS ISO 8859-6 (Arabic)"
404 depends on NLS
405 help 374 help
406 If you want to display filenames with native language characters 375 If you want to display filenames with native language characters
407 from the Microsoft FAT file system family or from JOLIET CD-ROMs 376 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -411,7 +380,6 @@ config NLS_ISO8859_6
411 380
412config NLS_ISO8859_7 381config NLS_ISO8859_7
413 tristate "NLS ISO 8859-7 (Modern Greek)" 382 tristate "NLS ISO 8859-7 (Modern Greek)"
414 depends on NLS
415 help 383 help
416 If you want to display filenames with native language characters 384 If you want to display filenames with native language characters
417 from the Microsoft FAT file system family or from JOLIET CD-ROMs 385 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -421,7 +389,6 @@ config NLS_ISO8859_7
421 389
422config NLS_ISO8859_9 390config NLS_ISO8859_9
423 tristate "NLS ISO 8859-9 (Latin 5; Turkish)" 391 tristate "NLS ISO 8859-9 (Latin 5; Turkish)"
424 depends on NLS
425 help 392 help
426 If you want to display filenames with native language characters 393 If you want to display filenames with native language characters
427 from the Microsoft FAT file system family or from JOLIET CD-ROMs 394 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -432,7 +399,6 @@ config NLS_ISO8859_9
432 399
433config NLS_ISO8859_13 400config NLS_ISO8859_13
434 tristate "NLS ISO 8859-13 (Latin 7; Baltic)" 401 tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
435 depends on NLS
436 help 402 help
437 If you want to display filenames with native language characters 403 If you want to display filenames with native language characters
438 from the Microsoft FAT file system family or from JOLIET CD-ROMs 404 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -443,7 +409,6 @@ config NLS_ISO8859_13
443 409
444config NLS_ISO8859_14 410config NLS_ISO8859_14
445 tristate "NLS ISO 8859-14 (Latin 8; Celtic)" 411 tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
446 depends on NLS
447 help 412 help
448 If you want to display filenames with native language characters 413 If you want to display filenames with native language characters
449 from the Microsoft FAT file system family or from JOLIET CD-ROMs 414 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -455,7 +420,6 @@ config NLS_ISO8859_14
455 420
456config NLS_ISO8859_15 421config NLS_ISO8859_15
457 tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)" 422 tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
458 depends on NLS
459 ---help--- 423 ---help---
460 If you want to display filenames with native language characters 424 If you want to display filenames with native language characters
461 from the Microsoft FAT file system family or from JOLIET CD-ROMs 425 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -472,7 +436,6 @@ config NLS_ISO8859_15
472 436
473config NLS_KOI8_R 437config NLS_KOI8_R
474 tristate "NLS KOI8-R (Russian)" 438 tristate "NLS KOI8-R (Russian)"
475 depends on NLS
476 help 439 help
477 If you want to display filenames with native language characters 440 If you want to display filenames with native language characters
478 from the Microsoft FAT file system family or from JOLIET CD-ROMs 441 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -482,7 +445,6 @@ config NLS_KOI8_R
482 445
483config NLS_KOI8_U 446config NLS_KOI8_U
484 tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)" 447 tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
485 depends on NLS
486 help 448 help
487 If you want to display filenames with native language characters 449 If you want to display filenames with native language characters
488 from the Microsoft FAT file system family or from JOLIET CD-ROMs 450 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -492,7 +454,6 @@ config NLS_KOI8_U
492 454
493config NLS_UTF8 455config NLS_UTF8
494 tristate "NLS UTF-8" 456 tristate "NLS UTF-8"
495 depends on NLS
496 help 457 help
497 If you want to display filenames with native language characters 458 If you want to display filenames with native language characters
498 from the Microsoft FAT file system family or from JOLIET CD-ROMs 459 from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -500,5 +461,4 @@ config NLS_UTF8
500 input/output character sets. Say Y here for the UTF-8 encoding of 461 input/output character sets. Say Y here for the UTF-8 encoding of
501 the Unicode/ISO9646 universal character set. 462 the Unicode/ISO9646 universal character set.
502 463
503endmenu 464endif # NLS
504