Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / pvrusb2 / pvrusb2-ctrl.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 55ea914c7fcd3e0a21a17671ef68294831b4a567..7d5a7139a45ae122b279ba28e22b93a4728a9f81 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -203,7 +203,7 @@ int pvr2_ctrl_get_valname(struct pvr2_ctrl *cptr,int val,
        *blen = 0;
        LOCK_TAKE(cptr->hdw->big_lock); do {
                if (cptr->info->type == pvr2_ctl_enum) {
-                       const char **names;
+                       const char * const *names;
                        names = cptr->info->def.type_enum.value_names;
                        if (pvr2_ctrl_range_check(cptr,val) == 0) {
                                if (names[val]) {
@@ -367,7 +367,7 @@ static const char *boolNames[] = {
 
 static int parse_token(const char *ptr,unsigned int len,
                       int *valptr,
-                      const char **names,unsigned int namecnt)
+                      const char * const *names, unsigned int namecnt)
 {
        char buf[33];
        unsigned int slen;
@@ -559,7 +559,7 @@ int pvr2_ctrl_value_to_sym_internal(struct pvr2_ctrl *cptr,
                *len = scnprintf(buf,maxlen,"%s",val ? "true" : "false");
                ret = 0;
        } else if (cptr->info->type == pvr2_ctl_enum) {
-               const char **names;
+               const char * const *names;
                names = cptr->info->def.type_enum.value_names;
                if ((val >= 0) &&
                    (val < cptr->info->def.type_enum.count)) {