---

yaml --- r: 138339 b: refs/heads/master c: 8737f66 h: refs/heads/master i: 138337: 8939362 138335: 6d7e685 v: v3
git-mirror · Mar 30, 2009 · 7dc0a66 · 7dc0a66
1 parent 8852a7d
commit 7dc0a66
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: cf47d878e5c7825836abf8d37fde025f7676db2b
+refs/heads/master: 8737f66e6415e8dbe8c8b26d63692d87a4ad5b29
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -245,9 +245,9 @@ static int v4l_fbuffer_alloc(struct zoran_fh *fh)
 			SetPageReserved(virt_to_page(mem + off));
 		dprintk(4,
 			KERN_INFO
-			"%s: %s - V4L frame %d mem 0x%lx (bus: 0x%lx)\n",
+			"%s: %s - V4L frame %d mem 0x%lx (bus: 0x%llx)\n",
 			ZR_DEVNAME(zr), __func__, i, (unsigned long) mem,
-			virt_to_bus(mem));
+			(unsigned long long)virt_to_bus(mem));
 	}
 
 	fh->buffers.allocated = 1;