Merge branch 'linus' into cpus4096

[pandora-kernel.git] / drivers / media / video / cx18 / cx18-av-firmware.c

diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c
index 526e142..a1a6af6 100644 (file)
--- a/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/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) {