diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 02:56:23 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 02:56:23 (GMT) |
commit | 829f51dbd825256197fb2a89705d42ad83f958ef (patch) | |
tree | 78faf49e78cd28f145b08ab579576021e24dc64c | |
parent | 804ce9866d56130032c9c8afc90a1297b7deed56 (diff) | |
parent | 8b8c0daa2c5388b629e506f8fac486392f81c826 (diff) | |
download | linux-829f51dbd825256197fb2a89705d42ad83f958ef.tar.xz |
Merge branch 'akpm' (Fixups for Andrew's patchbomb)
Merge fixups for the mac NLS tables from Andrew.
* emailed from Andrew Morton, and one cleanup by me:
nls: fix (and rename) mac NLS table files and config options
fs/nls/Makefile: remove bogus CONFIG_ assignments
-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 b5eac98..e2ce79e 100644 --- a/fs/nls/Kconfig +++ b/fs/nls/Kconfig @@ -452,7 +452,7 @@ config NLS_KOI8_U input/output character sets. Say Y here for the preferred Ukrainian (koi8-u) and Belarusian (koi8-ru) character sets. -config NLS_CODEPAGE_MACROMAN +config NLS_MAC_ROMAN tristate "Codepage macroman" ---help--- The Apple HFS file system family can deal with filenames in @@ -467,7 +467,7 @@ config NLS_CODEPAGE_MACROMAN If unsure, say Y. -config NLS_CODEPAGE_MACCELTIC +config NLS_MAC_CELTIC tristate "Codepage macceltic" ---help--- The Apple HFS file system family can deal with filenames in @@ -481,7 +481,7 @@ config NLS_CODEPAGE_MACCELTIC If unsure, say Y. -config NLS_CODEPAGE_MACCENTEURO +config NLS_MAC_CENTEURO tristate "Codepage maccenteuro" ---help--- The Apple HFS file system family can deal with filenames in @@ -495,7 +495,7 @@ config NLS_CODEPAGE_MACCENTEURO If unsure, say Y. -config NLS_CODEPAGE_MACCROATIAN +config NLS_MAC_CROATIAN tristate "Codepage maccroatian" ---help--- The Apple HFS file system family can deal with filenames in @@ -509,7 +509,7 @@ config NLS_CODEPAGE_MACCROATIAN If unsure, say Y. -config NLS_CODEPAGE_MACCYRILLIC +config NLS_MAC_CYRILLIC tristate "Codepage maccyrillic" ---help--- The Apple HFS file system family can deal with filenames in @@ -523,7 +523,7 @@ config NLS_CODEPAGE_MACCYRILLIC If unsure, say Y. -config NLS_CODEPAGE_MACGAELIC +config NLS_MAC_GAELIC tristate "Codepage macgaelic" ---help--- The Apple HFS file system family can deal with filenames in @@ -537,7 +537,7 @@ config NLS_CODEPAGE_MACGAELIC If unsure, say Y. -config NLS_CODEPAGE_MACGREEK +config NLS_MAC_GREEK tristate "Codepage macgreek" ---help--- The Apple HFS file system family can deal with filenames in @@ -551,7 +551,7 @@ config NLS_CODEPAGE_MACGREEK If unsure, say Y. -config NLS_CODEPAGE_MACICELAND +config NLS_MAC_ICELAND tristate "Codepage maciceland" ---help--- The Apple HFS file system family can deal with filenames in @@ -565,7 +565,7 @@ config NLS_CODEPAGE_MACICELAND If unsure, say Y. -config NLS_CODEPAGE_MACINUIT +config NLS_MAC_INUIT tristate "Codepage macinuit" ---help--- The Apple HFS file system family can deal with filenames in @@ -579,7 +579,7 @@ config NLS_CODEPAGE_MACINUIT If unsure, say Y. -config NLS_CODEPAGE_MACROMANIAN +config NLS_MAC_ROMANIAN tristate "Codepage macromanian" ---help--- The Apple HFS file system family can deal with filenames in @@ -593,7 +593,7 @@ config NLS_CODEPAGE_MACROMANIAN If unsure, say Y. -config NLS_CODEPAGE_MACTURKISH +config NLS_MAC_TURKISH tristate "Codepage macturkish" ---help--- The Apple HFS file system family can deal with filenames in diff --git a/fs/nls/Makefile b/fs/nls/Makefile index b6b0550..8ae37c1 100644 --- a/fs/nls/Makefile +++ b/fs/nls/Makefile @@ -2,18 +2,6 @@ # Makefile for native language support # -CONFIG_NLS_MACCELTIC=m -CONFIG_NLS_MACCENTEURO=m -CONFIG_NLS_MACCROATIAN=m -CONFIG_NLS_MACCYRILLIC=m -CONFIG_NLS_MACGAELIC=m -CONFIG_NLS_MACGREEK=m -CONFIG_NLS_MACICELAND=m -CONFIG_NLS_MACINUIT=m -CONFIG_NLS_MACROMANIAN=m -CONFIG_NLS_MACROMAN=m -CONFIG_NLS_MACTURKISH=m - obj-$(CONFIG_NLS) += nls_base.o obj-$(CONFIG_NLS_CODEPAGE_437) += nls_cp437.o @@ -54,14 +42,14 @@ obj-$(CONFIG_NLS_ISO8859_15) += nls_iso8859-15.o obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o obj-$(CONFIG_NLS_KOI8_U) += nls_koi8-u.o nls_koi8-ru.o obj-$(CONFIG_NLS_UTF8) += nls_utf8.o -obj-$(CONFIG_NLS_MACCELTIC) += nls_macceltic.o -obj-$(CONFIG_NLS_MACCENTEURO) += nls_maccenteuro.o -obj-$(CONFIG_NLS_MACCROATIAN) += nls_maccroatian.o -obj-$(CONFIG_NLS_MACCYRILLIC) += nls_maccyrillic.o -obj-$(CONFIG_NLS_MACGAELIC) += nls_macgaelic.o -obj-$(CONFIG_NLS_MACGREEK) += nls_macgreek.o -obj-$(CONFIG_NLS_MACICELAND) += nls_maciceland.o -obj-$(CONFIG_NLS_MACINUIT) += nls_macinuit.o -obj-$(CONFIG_NLS_MACROMANIAN) += nls_macromanian.o -obj-$(CONFIG_NLS_MACROMAN) += nls_macroman.o -obj-$(CONFIG_NLS_MACTURKISH) += nls_macturkish.o +obj-$(CONFIG_NLS_MAC_CELTIC) += mac-celtic.o +obj-$(CONFIG_NLS_MAC_CENTEURO) += mac-centeuro.o +obj-$(CONFIG_NLS_MAC_CROATIAN) += mac-croatian.o +obj-$(CONFIG_NLS_MAC_CYRILLIC) += mac-cyrillic.o +obj-$(CONFIG_NLS_MAC_GAELIC) += mac-gaelic.o +obj-$(CONFIG_NLS_MAC_GREEK) += mac-greek.o +obj-$(CONFIG_NLS_MAC_ICELAND) += mac-iceland.o +obj-$(CONFIG_NLS_MAC_INUIT) += mac-inuit.o +obj-$(CONFIG_NLS_MAC_ROMANIAN) += mac-romanian.o +obj-$(CONFIG_NLS_MAC_ROMAN) += mac-roman.o +obj-$(CONFIG_NLS_MAC_TURKISH) += mac-turkish.o diff --git a/fs/nls/nls_macceltic.c b/fs/nls/mac-celtic.c index 95ac5b4..634a8b7 100644 --- a/fs/nls/nls_macceltic.c +++ b/fs/nls/mac-celtic.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macceltic.c + * linux/fs/nls/mac-celtic.c * * Charset macceltic translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_maccenteuro.c b/fs/nls/mac-centeuro.c index ce0d57e..979e626 100644 --- a/fs/nls/nls_maccenteuro.c +++ b/fs/nls/mac-centeuro.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_maccenteuro.c + * linux/fs/nls/mac-centeuro.c * * Charset maccenteuro translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_maccroatian.c b/fs/nls/mac-croatian.c index 10b01c3..dd3f675 100644 --- a/fs/nls/nls_maccroatian.c +++ b/fs/nls/mac-croatian.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_maccroatian.c + * linux/fs/nls/mac-croatian.c * * Charset maccroatian translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_maccyrillic.c b/fs/nls/mac-cyrillic.c index 318473f..1112c84 100644 --- a/fs/nls/nls_maccyrillic.c +++ b/fs/nls/mac-cyrillic.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_maccyrillic.c + * linux/fs/nls/mac-cyrillic.c * * Charset maccyrillic translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macgaelic.c b/fs/nls/mac-gaelic.c index 615d8e1..2de9158 100644 --- a/fs/nls/nls_macgaelic.c +++ b/fs/nls/mac-gaelic.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macgaelic.c + * linux/fs/nls/mac-gaelic.c * * Charset macgaelic translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macgreek.c b/fs/nls/mac-greek.c index 79880f3..a863100 100644 --- a/fs/nls/nls_macgreek.c +++ b/fs/nls/mac-greek.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macgreek.c + * linux/fs/nls/mac-greek.c * * Charset macgreek translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_maciceland.c b/fs/nls/mac-iceland.c index 1e688c5..babe299 100644 --- a/fs/nls/nls_maciceland.c +++ b/fs/nls/mac-iceland.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_maciceland.c + * linux/fs/nls/mac-iceland.c * * Charset maciceland translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macinuit.c b/fs/nls/mac-inuit.c index f333d98..312364f 100644 --- a/fs/nls/nls_macinuit.c +++ b/fs/nls/mac-inuit.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macinuit.c + * linux/fs/nls/mac-inuit.c * * Charset macinuit translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macroman.c b/fs/nls/mac-roman.c index 6315a85..53ce080 100644 --- a/fs/nls/nls_macroman.c +++ b/fs/nls/mac-roman.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macroman.c + * linux/fs/nls/mac-roman.c * * Charset macroman translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macromanian.c b/fs/nls/mac-romanian.c index b83c07a..add6f7a 100644 --- a/fs/nls/nls_macromanian.c +++ b/fs/nls/mac-romanian.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macromanian.c + * linux/fs/nls/mac-romanian.c * * Charset macromanian translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_macturkish.c b/fs/nls/mac-turkish.c index 0cc2c65..dffa96d 100644 --- a/fs/nls/nls_macturkish.c +++ b/fs/nls/mac-turkish.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls/nls_macturkish.c + * linux/fs/nls/mac-turkish.c * * Charset macturkish translation tables. * Generated automatically from the Unicode and charset |