diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-18 08:25:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-06-18 08:25:05 -0700 |
| commit | a8c0a4a5b062a56e5494894aa86b89a21a86ea3e (patch) | |
| tree | 5d237970244ed1550ad402ea0d8c38df1bda5306 /include/linux/nls.h | |
| parent | 003fb4d9a0f16ffcf2d133469941c87824cd641b (diff) | |
| parent | 83e756cbc3fc1689d40567b71511adc1089f85e0 (diff) | |
| download | kernel_samsung_smdk4412-a8c0a4a5b062a56e5494894aa86b89a21a86ea3e.zip kernel_samsung_smdk4412-a8c0a4a5b062a56e5494894aa86b89a21a86ea3e.tar.gz kernel_samsung_smdk4412-a8c0a4a5b062a56e5494894aa86b89a21a86ea3e.tar.bz2 | |
Merge "Samsung i9300 Update 10" into cm-10.1
Diffstat (limited to 'include/linux/nls.h')
| -rw-r--r-- | include/linux/nls.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/nls.h b/include/linux/nls.h index d47beef..2ba14c4 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h @@ -43,7 +43,7 @@ enum utf16_endian { UTF16_BIG_ENDIAN }; -/* nls.c */ +/* nls_base.c */ extern int register_nls(struct nls_table *); extern int unregister_nls(struct nls_table *); extern struct nls_table *load_nls(char *); @@ -52,7 +52,8 @@ extern struct nls_table *load_nls_default(void); extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu); extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen); -extern int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs); +extern int utf8s_to_utf16s(const u8 *s, int len, + enum utf16_endian endian, wchar_t *pwcs, int maxlen); extern int utf16s_to_utf8s(const wchar_t *pwcs, int len, enum utf16_endian endian, u8 *s, int maxlen); |