Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / sp887x.c

diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 49f55877f51366f66e1b5225caf1e4fc756ad595..4543609e181619aae2b7746855e88c346112901a 100644 (file)
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -140,7 +140,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
        u8 buf [BLOCKSIZE+2];
        int i;
        int fw_size = fw->size;
-       unsigned char *mem = fw->data;
+       const unsigned char *mem = fw->data;
 
        dprintk("%s\n", __func__);