From ffcab23f2fc165e527f17ac956a6f09dc8f03b45 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 25 Mar 2006 09:24:19 -0300
Subject: [PATCH] --- yaml --- r: 23654 b: refs/heads/master c:
 22fe087f0139e2f5cbe004f24f84cb1c08b4711e h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/v4l2-common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f4016a1fd25..b5d8f27a1b65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48773e685b118ef56dcf5258ef7388a4bea16137
+refs/heads/master: 22fe087f0139e2f5cbe004f24f84cb1c08b4711e
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c
index 6824ee045fe6..11a97f30b876 100644
--- a/trunk/drivers/media/video/v4l2-common.c
+++ b/trunk/drivers/media/video/v4l2-common.c
@@ -472,7 +472,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
 				prt_names(p->memory,v4l2_memory_names),
 				p->m.userptr);
 		printk ("%s: timecode= %02d:%02d:%02d type=%d, "
-			"flags=0x%08x, frames=%d, userbits=0x%08p\n",
+			"flags=0x%08x, frames=%d, userbits=0x%p\n",
 				s,tc->hours,tc->minutes,tc->seconds,
 				tc->type, tc->flags, tc->frames, tc->userbits);
 		break;