From 7dc0a66f416f701e900d4cf68ea558b541f6fb0b Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 27 Mar 2009 14:01:11 -0300 Subject: [PATCH] --- yaml --- r: 138339 b: refs/heads/master c: 8737f66e6415e8dbe8c8b26d63692d87a4ad5b29 h: refs/heads/master i: 138337: 8939362759366fc0180569f6e0001186367970d4 138335: 6d7e685b72044c8c2514034904c1212598b9f93c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran/zoran_driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4ae76b9649c4..291fa19bea42 100644 --- 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 index 1e87fb9f7146..f16e57cf11e4 100644 --- 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;