diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nls/Kconfig | 22 | ||||
-rw-r--r-- | fs/nls/Makefile | 34 | ||||
-rw-r--r-- | fs/nls/mac-celtic.c (renamed from fs/nls/nls_macceltic.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-centeuro.c (renamed from fs/nls/nls_maccenteuro.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-croatian.c (renamed from fs/nls/nls_maccroatian.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-cyrillic.c (renamed from fs/nls/nls_maccyrillic.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-gaelic.c (renamed from fs/nls/nls_macgaelic.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-greek.c (renamed from fs/nls/nls_macgreek.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-iceland.c (renamed from fs/nls/nls_maciceland.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-inuit.c (renamed from fs/nls/nls_macinuit.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-roman.c (renamed from fs/nls/nls_macroman.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-romanian.c (renamed from fs/nls/nls_macromanian.c) | 2 | ||||
-rw-r--r-- | fs/nls/mac-turkish.c (renamed from fs/nls/nls_macturkish.c) | 2 |
13 files changed, 33 insertions, 45 deletions
diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig index b5eac98fd7bd..e2ce79ef48c4 100644 --- a/fs/nls/Kconfig +++ b/fs/nls/Kconfig | |||
@@ -452,7 +452,7 @@ config NLS_KOI8_U | |||
452 | input/output character sets. Say Y here for the preferred Ukrainian | 452 | input/output character sets. Say Y here for the preferred Ukrainian |
453 | (koi8-u) and Belarusian (koi8-ru) character sets. | 453 | (koi8-u) and Belarusian (koi8-ru) character sets. |
454 | 454 | ||
455 | config NLS_CODEPAGE_MACROMAN | 455 | config NLS_MAC_ROMAN |
456 | tristate "Codepage macroman" | 456 | tristate "Codepage macroman" |
457 | ---help--- | 457 | ---help--- |
458 | The Apple HFS file system family can deal with filenames in | 458 | The Apple HFS file system family can deal with filenames in |
@@ -467,7 +467,7 @@ config NLS_CODEPAGE_MACROMAN | |||
467 | 467 | ||
468 | If unsure, say Y. | 468 | If unsure, say Y. |
469 | 469 | ||
470 | config NLS_CODEPAGE_MACCELTIC | 470 | config NLS_MAC_CELTIC |
471 | tristate "Codepage macceltic" | 471 | tristate "Codepage macceltic" |
472 | ---help--- | 472 | ---help--- |
473 | The Apple HFS file system family can deal with filenames in | 473 | The Apple HFS file system family can deal with filenames in |
@@ -481,7 +481,7 @@ config NLS_CODEPAGE_MACCELTIC | |||
481 | 481 | ||
482 | If unsure, say Y. | 482 | If unsure, say Y. |
483 | 483 | ||
484 | config NLS_CODEPAGE_MACCENTEURO | 484 | config NLS_MAC_CENTEURO |
485 | tristate "Codepage maccenteuro" | 485 | tristate "Codepage maccenteuro" |
486 | ---help--- | 486 | ---help--- |
487 | The Apple HFS file system family can deal with filenames in | 487 | The Apple HFS file system family can deal with filenames in |
@@ -495,7 +495,7 @@ config NLS_CODEPAGE_MACCENTEURO | |||
495 | 495 | ||
496 | If unsure, say Y. | 496 | If unsure, say Y. |
497 | 497 | ||
498 | config NLS_CODEPAGE_MACCROATIAN | 498 | config NLS_MAC_CROATIAN |
499 | tristate "Codepage maccroatian" | 499 | tristate "Codepage maccroatian" |
500 | ---help--- | 500 | ---help--- |
501 | The Apple HFS file system family can deal with filenames in | 501 | The Apple HFS file system family can deal with filenames in |
@@ -509,7 +509,7 @@ config NLS_CODEPAGE_MACCROATIAN | |||
509 | 509 | ||
510 | If unsure, say Y. | 510 | If unsure, say Y. |
511 | 511 | ||
512 | config NLS_CODEPAGE_MACCYRILLIC | 512 | config NLS_MAC_CYRILLIC |
513 | tristate "Codepage maccyrillic" | 513 | tristate "Codepage maccyrillic" |
514 | ---help--- | 514 | ---help--- |
515 | The Apple HFS file system family can deal with filenames in | 515 | The Apple HFS file system family can deal with filenames in |
@@ -523,7 +523,7 @@ config NLS_CODEPAGE_MACCYRILLIC | |||
523 | 523 | ||
524 | If unsure, say Y. | 524 | If unsure, say Y. |
525 | 525 | ||
526 | config NLS_CODEPAGE_MACGAELIC | 526 | config NLS_MAC_GAELIC |
527 | tristate "Codepage macgaelic" | 527 | tristate "Codepage macgaelic" |
528 | ---help--- | 528 | ---help--- |
529 | The Apple HFS file system family can deal with filenames in | 529 | The Apple HFS file system family can deal with filenames in |
@@ -537,7 +537,7 @@ config NLS_CODEPAGE_MACGAELIC | |||
537 | 537 | ||
538 | If unsure, say Y. | 538 | If unsure, say Y. |
539 | 539 | ||
540 | config NLS_CODEPAGE_MACGREEK | 540 | config NLS_MAC_GREEK |
541 | tristate "Codepage macgreek" | 541 | tristate "Codepage macgreek" |
542 | ---help--- | 542 | ---help--- |
543 | The Apple HFS file system family can deal with filenames in | 543 | The Apple HFS file system family can deal with filenames in |
@@ -551,7 +551,7 @@ config NLS_CODEPAGE_MACGREEK | |||
551 | 551 | ||
552 | If unsure, say Y. | 552 | If unsure, say Y. |
553 | 553 | ||
554 | config NLS_CODEPAGE_MACICELAND | 554 | config NLS_MAC_ICELAND |
555 | tristate "Codepage maciceland" | 555 | tristate "Codepage maciceland" |
556 | ---help--- | 556 | ---help--- |
557 | The Apple HFS file system family can deal with filenames in | 557 | The Apple HFS file system family can deal with filenames in |
@@ -565,7 +565,7 @@ config NLS_CODEPAGE_MACICELAND | |||
565 | 565 | ||
566 | If unsure, say Y. | 566 | If unsure, say Y. |
567 | 567 | ||
568 | config NLS_CODEPAGE_MACINUIT | 568 | config NLS_MAC_INUIT |
569 | tristate "Codepage macinuit" | 569 | tristate "Codepage macinuit" |
570 | ---help--- | 570 | ---help--- |
571 | The Apple HFS file system family can deal with filenames in | 571 | The Apple HFS file system family can deal with filenames in |
@@ -579,7 +579,7 @@ config NLS_CODEPAGE_MACINUIT | |||
579 | 579 | ||
580 | If unsure, say Y. | 580 | If unsure, say Y. |
581 | 581 | ||
582 | config NLS_CODEPAGE_MACROMANIAN | 582 | config NLS_MAC_ROMANIAN |
583 | tristate "Codepage macromanian" | 583 | tristate "Codepage macromanian" |
584 | ---help--- | 584 | ---help--- |
585 | The Apple HFS file system family can deal with filenames in | 585 | The Apple HFS file system family can deal with filenames in |
@@ -593,7 +593,7 @@ config NLS_CODEPAGE_MACROMANIAN | |||
593 | 593 | ||
594 | If unsure, say Y. | 594 | If unsure, say Y. |
595 | 595 | ||
596 | config NLS_CODEPAGE_MACTURKISH | 596 | config NLS_MAC_TURKISH |
597 | tristate "Codepage macturkish" | 597 | tristate "Codepage macturkish" |
598 | ---help--- | 598 | ---help--- |
599 | The Apple HFS file system family can deal with filenames in | 599 | The Apple HFS file system family can deal with filenames in |
diff --git a/fs/nls/Makefile b/fs/nls/Makefile index b6b0550a7c80..8ae37c1b5249 100644 --- a/fs/nls/Makefile +++ b/fs/nls/Makefile | |||
@@ -2,18 +2,6 @@ | |||
2 | # Makefile for native language support | 2 | # Makefile for native language support |
3 | # | 3 | # |
4 | 4 | ||
5 | CONFIG_NLS_MACCELTIC=m | ||
6 | CONFIG_NLS_MACCENTEURO=m | ||
7 | CONFIG_NLS_MACCROATIAN=m | ||
8 | CONFIG_NLS_MACCYRILLIC=m | ||
9 | CONFIG_NLS_MACGAELIC=m | ||
10 | CONFIG_NLS_MACGREEK=m | ||
11 | CONFIG_NLS_MACICELAND=m | ||
12 | CONFIG_NLS_MACINUIT=m | ||
13 | CONFIG_NLS_MACROMANIAN=m | ||
14 | CONFIG_NLS_MACROMAN=m | ||
15 | CONFIG_NLS_MACTURKISH=m | ||
16 | |||
17 | obj-$(CONFIG_NLS) += nls_base.o | 5 | obj-$(CONFIG_NLS) += nls_base.o |
18 | 6 | ||
19 | obj-$(CONFIG_NLS_CODEPAGE_437) += nls_cp437.o | 7 | obj-$(CONFIG_NLS_CODEPAGE_437) += nls_cp437.o |
@@ -54,14 +42,14 @@ obj-$(CONFIG_NLS_ISO8859_15) += nls_iso8859-15.o | |||
54 | obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o | 42 | obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o |
55 | obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o | 43 | obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o |
56 | obj-$(CONFIG_NLS_UTF8) += nls_utf8.o | 44 | obj-$(CONFIG_NLS_UTF8) += nls_utf8.o |
57 | obj-$(CONFIG_NLS_MACCELTIC) += nls_macceltic.o | 45 | obj-$(CONFIG_NLS_MAC_CELTIC) += mac-celtic.o |
58 | obj-$(CONFIG_NLS_MACCENTEURO) += nls_maccenteuro.o | 46 | obj-$(CONFIG_NLS_MAC_CENTEURO) += mac-centeuro.o |
59 | obj-$(CONFIG_NLS_MACCROATIAN) += nls_maccroatian.o | 47 | obj-$(CONFIG_NLS_MAC_CROATIAN) += mac-croatian.o |
60 | obj-$(CONFIG_NLS_MACCYRILLIC) += nls_maccyrillic.o | 48 | obj-$(CONFIG_NLS_MAC_CYRILLIC) += mac-cyrillic.o |
61 | obj-$(CONFIG_NLS_MACGAELIC) += nls_macgaelic.o | 49 | obj-$(CONFIG_NLS_MAC_GAELIC) += mac-gaelic.o |
62 | obj-$(CONFIG_NLS_MACGREEK) += nls_macgreek.o | 50 | obj-$(CONFIG_NLS_MAC_GREEK) += mac-greek.o |
63 | obj-$(CONFIG_NLS_MACICELAND) += nls_maciceland.o | 51 | obj-$(CONFIG_NLS_MAC_ICELAND) += mac-iceland.o |
64 | obj-$(CONFIG_NLS_MACINUIT) += nls_macinuit.o | 52 | obj-$(CONFIG_NLS_MAC_INUIT) += mac-inuit.o |
65 | obj-$(CONFIG_NLS_MACROMANIAN) += nls_macromanian.o | 53 | obj-$(CONFIG_NLS_MAC_ROMANIAN) += mac-romanian.o |
66 | obj-$(CONFIG_NLS_MACROMAN) += nls_macroman.o | 54 | obj-$(CONFIG_NLS_MAC_ROMAN) += mac-roman.o |
67 | obj-$(CONFIG_NLS_MACTURKISH) += nls_macturkish.o | 55 | obj-$(CONFIG_NLS_MAC_TURKISH) += mac-turkish.o |
diff --git a/fs/nls/nls_macceltic.c b/fs/nls/mac-celtic.c index 95ac5b41ad1c..634a8b717b02 100644 --- a/fs/nls/nls_macceltic.c +++ b/fs/nls/mac-celtic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macceltic.c | 2 | * linux/fs/nls/mac-celtic.c |
3 | * | 3 | * |
4 | * Charset macceltic translation tables. | 4 | * Charset macceltic translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_maccenteuro.c b/fs/nls/mac-centeuro.c index ce0d57ef39f6..979e6265ac5e 100644 --- a/fs/nls/nls_maccenteuro.c +++ b/fs/nls/mac-centeuro.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_maccenteuro.c | 2 | * linux/fs/nls/mac-centeuro.c |
3 | * | 3 | * |
4 | * Charset maccenteuro translation tables. | 4 | * Charset maccenteuro translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_maccroatian.c b/fs/nls/mac-croatian.c index 10b01c3eed66..dd3f675911ee 100644 --- a/fs/nls/nls_maccroatian.c +++ b/fs/nls/mac-croatian.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_maccroatian.c | 2 | * linux/fs/nls/mac-croatian.c |
3 | * | 3 | * |
4 | * Charset maccroatian translation tables. | 4 | * Charset maccroatian translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_maccyrillic.c b/fs/nls/mac-cyrillic.c index 318473fbb26c..1112c84dd8bb 100644 --- a/fs/nls/nls_maccyrillic.c +++ b/fs/nls/mac-cyrillic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_maccyrillic.c | 2 | * linux/fs/nls/mac-cyrillic.c |
3 | * | 3 | * |
4 | * Charset maccyrillic translation tables. | 4 | * Charset maccyrillic translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macgaelic.c b/fs/nls/mac-gaelic.c index 615d8e128f14..2de9158409c8 100644 --- a/fs/nls/nls_macgaelic.c +++ b/fs/nls/mac-gaelic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macgaelic.c | 2 | * linux/fs/nls/mac-gaelic.c |
3 | * | 3 | * |
4 | * Charset macgaelic translation tables. | 4 | * Charset macgaelic translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macgreek.c b/fs/nls/mac-greek.c index 79880f30494f..a86310082802 100644 --- a/fs/nls/nls_macgreek.c +++ b/fs/nls/mac-greek.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macgreek.c | 2 | * linux/fs/nls/mac-greek.c |
3 | * | 3 | * |
4 | * Charset macgreek translation tables. | 4 | * Charset macgreek translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_maciceland.c b/fs/nls/mac-iceland.c index 1e688c59b252..babe2998d5ce 100644 --- a/fs/nls/nls_maciceland.c +++ b/fs/nls/mac-iceland.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_maciceland.c | 2 | * linux/fs/nls/mac-iceland.c |
3 | * | 3 | * |
4 | * Charset maciceland translation tables. | 4 | * Charset maciceland translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macinuit.c b/fs/nls/mac-inuit.c index f333d98941d6..312364f010dc 100644 --- a/fs/nls/nls_macinuit.c +++ b/fs/nls/mac-inuit.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macinuit.c | 2 | * linux/fs/nls/mac-inuit.c |
3 | * | 3 | * |
4 | * Charset macinuit translation tables. | 4 | * Charset macinuit translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macroman.c b/fs/nls/mac-roman.c index 6315a857ab68..53ce0809cbd2 100644 --- a/fs/nls/nls_macroman.c +++ b/fs/nls/mac-roman.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macroman.c | 2 | * linux/fs/nls/mac-roman.c |
3 | * | 3 | * |
4 | * Charset macroman translation tables. | 4 | * Charset macroman translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macromanian.c b/fs/nls/mac-romanian.c index b83c07a57d25..add6f7a0c666 100644 --- a/fs/nls/nls_macromanian.c +++ b/fs/nls/mac-romanian.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macromanian.c | 2 | * linux/fs/nls/mac-romanian.c |
3 | * | 3 | * |
4 | * Charset macromanian translation tables. | 4 | * Charset macromanian translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |
diff --git a/fs/nls/nls_macturkish.c b/fs/nls/mac-turkish.c index 0cc2c6572826..dffa96d5de00 100644 --- a/fs/nls/nls_macturkish.c +++ b/fs/nls/mac-turkish.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/fs/nls/nls_macturkish.c | 2 | * linux/fs/nls/mac-turkish.c |
3 | * | 3 | * |
4 | * Charset macturkish translation tables. | 4 | * Charset macturkish translation tables. |
5 | * Generated automatically from the Unicode and charset | 5 | * Generated automatically from the Unicode and charset |