---

yaml --- r: 137912 b: refs/heads/master c: 995a652 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 991db4b · 991db4b
1 parent 332c31a
commit 991db4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d979a86a95036a0c765aaa90f8bcefb4096a406
+refs/heads/master: 995a65285bde47bbb2a0c3dadc0b8822d47d78f4
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -344,9 +344,9 @@ v4l_fbuffer_alloc (struct file *file)
 				SetPageReserved(MAP_NR(mem + off));
 			dprintk(4,
 				KERN_INFO
-				"%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%lx)\n",
+				"%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%llx)\n",
 				ZR_DEVNAME(zr), i, (unsigned long) mem,
-				virt_to_bus(mem));
+				(unsigned long long)virt_to_bus(mem));
 		} else {
 
 			/* Use high memory which has been left at boot time */