diff --git a/[refs] b/[refs]
index 6d95279496e8..9b8c57a8245e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66cb930e957ccab9e51a7896b13e16d5caf31b0e
+refs/heads/master: 6df84ea86e3ae331bd692fb4fbf8b75f43bb4262
diff --git a/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c
index 4e0df60d29c0..f0dbead188c8 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-core.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-core.c
@@ -77,7 +77,7 @@ static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
 	struct saa7164_tsport *port = buf->port;
 
 	/* Feed the transport payload into the kernel demux */
-	dvb_dmx_swfilter_packets(&port->dvb.demux, buf->cpu,
+	dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu,
 		SAA7164_TS_NUMBER_OF_LINES);
 
 }