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 / cx18 / cx18-controls.c

diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index 67043c7b452b6f1f0c7a5ec74ebdcc6fa4c55da6..97d7b7e100a3d50ff43f948de3baccac0c9b069e 100644 (file)
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -108,7 +108,7 @@ static int cx18_try_ctrl(struct file *file, void *fh,
                                        struct v4l2_ext_control *vctrl)
 {
        struct v4l2_queryctrl qctrl;
-       const char **menu_items = NULL;
+       const char * const *menu_items = NULL;
        int err;
 
        qctrl.id = vctrl->id;