diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-17 23:44:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-17 23:44:45 -0300 |
commit | b6705f84947f09dd3858f839267c9662fdbd667b (patch) | |
tree | c6a5dea386c7c837b17cbb4b44a158b78ca4c65e /linux/drivers/media/video/zoran/zoran_driver.c | |
parent | 9446aad394fc912dc47f17e7638357edfd470ded (diff) | |
parent | aedda303081b327f1be76710db7032c675509d40 (diff) | |
download | mediapointer-dvb-s2-b6705f84947f09dd3858f839267c9662fdbd667b.tar.gz mediapointer-dvb-s2-b6705f84947f09dd3858f839267c9662fdbd667b.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_driver.c')
-rw-r--r-- | linux/drivers/media/video/zoran/zoran_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c index 2609f54d7..798745c0a 100644 --- a/linux/drivers/media/video/zoran/zoran_driver.c +++ b/linux/drivers/media/video/zoran/zoran_driver.c @@ -356,9 +356,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 { #if defined(CONFIG_BIGPHYS_AREA) /* Use bigphysarea_alloc_pages */ |