Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829f51db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 804ce986 8b8c0daa

fs/nls/Kconfig

+11 −11
Original line number Diff line number Diff line
@@ -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

fs/nls/Makefile

+11 −23
Original line number Diff line number Diff line
@@ -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

fs/nls/nls_macceltic.c→fs/nls/mac-celtic.c

+1 −1
Original line number Diff line number Diff line 
/*

 * linux/fs/nls/nls_macceltic.c

 * linux/fs/nls/mac-celtic.c

 *

 * Charset macceltic translation tables.

 * Generated automatically from the Unicode and charset

fs/nls/nls_maccenteuro.c→fs/nls/mac-centeuro.c

+1 −1
Original line number Diff line number Diff line 
/*

 * linux/fs/nls/nls_maccenteuro.c

 * linux/fs/nls/mac-centeuro.c

 *

 * Charset maccenteuro translation tables.

 * Generated automatically from the Unicode and charset

fs/nls/nls_maccroatian.c→fs/nls/mac-croatian.c

+1 −1
Original line number Diff line number Diff line 
/*

 * linux/fs/nls/nls_maccroatian.c

 * linux/fs/nls/mac-croatian.c

 *

 * Charset maccroatian translation tables.

 * Generated automatically from the Unicode and charset