Merge branch 'linus' into perf/urgent, to synchronize with upstream

[linux.git] / sound / core / info.c

diff --git a/sound/core/info.c b/sound/core/info.c
index e051a029ccfb44172737c4ade606929a17b70ffa..6801d8160866885eeab1dcdbfba396d9aca5ed80 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -20,7 +20,7 @@
 
 int snd_info_check_reserved_words(const char *str)
 {
-       static char *reserved[] =
+       static const char * const reserved[] =
        {
                "version",
                "meminfo",
@@ -35,7 +35,7 @@ int snd_info_check_reserved_words(const char *str)
                "seq",
                NULL
        };
-       char **xstr = reserved;
+       const char * const *xstr = reserved;
 
        while (*xstr) {
                if (!strcmp(*xstr, str))