diff --git a/[refs] b/[refs]
index d32e77bafe20..f6eb08985dc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bca76e89bc43f86136080536858048ebffab3e3
+refs/heads/master: 9b8a3e4cb1361cf4b4a50916876e72f07a9037e9
diff --git a/trunk/drivers/media/video/cx18/cx18-av-firmware.c b/trunk/drivers/media/video/cx18/cx18-av-firmware.c
index 526e142156cd..a1a6af6c1c8f 100644
--- a/trunk/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/trunk/drivers/media/video/cx18/cx18-av-firmware.c
@@ -29,7 +29,7 @@ int cx18_av_loadfw(struct cx18 *cx)
 	const struct firmware *fw = NULL;
 	u32 size;
 	u32 v;
-	u8 *ptr;
+	const u8 *ptr;
 	int i;
 
 	if (request_firmware(&fw, FWFILE, &cx->dev->dev) != 0) {