Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a77b645609084c030020bc58639d92da4316f410

Authored by Jan Engelhardt
Committed by Linus Torvalds
1 parent 2d1df8153c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 7 additions and 51 deletions Side-by-side Diff

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