diff --git a/[refs] b/[refs]
index b1bf52886b1f..ea64d090fd6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 407df29363f10642d87dbe49854c97eb57c84c94
+refs/heads/master: c2312f60d741df833abf48fee4a30aa523e55a58
diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
index cfa512112ca0..2bd312daeb1e 100644
--- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -79,7 +79,7 @@ void cx18_alsa_announce_pcm_data(struct snd_cx18_card *cxsc, u8 *pcm_data,
 	int period_elapsed = 0;
 	int length;
 
-	dprintk("cx18 alsa announce ptr=%p data=%p num_bytes=%d\n", cxsc,
+	dprintk("cx18 alsa announce ptr=%p data=%p num_bytes=%zd\n", cxsc,
 		pcm_data, num_bytes);
 
 	substream = cxsc->capture_pcm_substream;