diff --git a/[refs] b/[refs]
index bd8cda186628..897f46da95ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82026f9673cfa35c74a66e9d7bf1b0e44bb0de3f
+refs/heads/master: c06d8752e790ed1e717316416c10a7929f1873dd
diff --git a/trunk/drivers/media/platform/coda.c b/trunk/drivers/media/platform/coda.c
index 0d6e0a095607..690851400911 100644
--- a/trunk/drivers/media/platform/coda.c
+++ b/trunk/drivers/media/platform/coda.c
@@ -118,7 +118,7 @@ struct coda_dev {
 	struct v4l2_device	v4l2_dev;
 	struct video_device	vfd;
 	struct platform_device	*plat_dev;
-	struct coda_devtype	*devtype;
+	const struct coda_devtype *devtype;
 
 	void __iomem		*regs_base;
 	struct clk		*clk_per;
@@ -1687,7 +1687,7 @@ enum coda_platform {
 	CODA_IMX27,
 };
 
-static struct coda_devtype coda_devdata[] = {
+static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX27] = {
 		.firmware    = "v4l-codadx6-imx27.bin",
 		.product     = CODA_DX6,