diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 03:13:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-02 03:13:54 +0300 |
| commit | 71e41bbb43794e0fe4ce3b766d713e222ccfb5ea (patch) | |
| tree | 440f95dec8ac8fab4d817d76fe2714bbf1dedfe5 /include/linux/ucs2_string.h | |
| parent | a057c3259ab6ecab477379d23e27ea0afdb219e6 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-71e41bbb43794e0fe4ce3b766d713e222ccfb5ea.tar.xz | |
Merge 4.5-rc6 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/ucs2_string.h')
| -rw-r--r-- | include/linux/ucs2_string.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ucs2_string.h b/include/linux/ucs2_string.h index cbb20afdbc01..bb679b48f408 100644 --- a/include/linux/ucs2_string.h +++ b/include/linux/ucs2_string.h @@ -11,4 +11,8 @@ unsigned long ucs2_strlen(const ucs2_char_t *s); unsigned long ucs2_strsize(const ucs2_char_t *data, unsigned long maxlength); int ucs2_strncmp(const ucs2_char_t *a, const ucs2_char_t *b, size_t len); +unsigned long ucs2_utf8size(const ucs2_char_t *src); +unsigned long ucs2_as_utf8(u8 *dest, const ucs2_char_t *src, + unsigned long maxlength); + #endif /* _LINUX_UCS2_STRING_H_ */ |