Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / include / linux / nls.h

diff --git a/include/linux/nls.h b/include/linux/nls.h
index 816c04a..6a88220 100644 (file)
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -7,13 +7,13 @@
 typedef __u16 wchar_t;
 
 struct nls_table {
-       char *charset;
-       char *alias;
+       const char *charset;
+       const char *alias;
        int (*uni2char) (wchar_t uni, unsigned char *out, int boundlen);
        int (*char2uni) (const unsigned char *rawstring, int boundlen,
                         wchar_t *uni);
-       unsigned char *charset2lower;
-       unsigned char *charset2upper;
+       const unsigned char *charset2lower;
+       const unsigned char *charset2upper;
        struct module *owner;
        struct nls_table *next;
 };