Merge commit 'v2.6.29-rc1' into core/urgent

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / spca508.c

diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 63ec902c895d0398116f30732e098d8d74daeb69..be5d740a315d614b95f7077bcb11b4137e65e32e 100644 (file)
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -62,7 +62,7 @@ static struct ctrl sd_ctrls[] = {
        },
 };
 
-static struct v4l2_pix_format sif_mode[] = {
+static const struct v4l2_pix_format sif_mode[] = {
        {160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
                .bytesperline = 160,
                .sizeimage = 160 * 120 * 3 / 2,