diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-18 01:19:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-18 01:19:27 -0300 |
| commit | ba9ada241fb72554a85cf3ae478d3de60e4ead69 (patch) | |
| tree | bee299dba2de83f7b4deb58c3b536b96f8d6e1dd /linux/drivers | |
| parent | 2e3b1637aecc92ad8dc8d8e786dd1e038f68f349 (diff) | |
| parent | d66729ce3b0aa3defd54f232ddb3190b58fff97d (diff) | |
| download | mediapointer-dvb-s2-ba9ada241fb72554a85cf3ae478d3de60e4ead69.tar.gz mediapointer-dvb-s2-ba9ada241fb72554a85cf3ae478d3de60e4ead69.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/sh_mobile_ceu_camera.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/videobuf-dma-contig.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/video/sh_mobile_ceu_camera.c b/linux/drivers/media/video/sh_mobile_ceu_camera.c index 6560ff496..012005e1a 100644 --- a/linux/drivers/media/video/sh_mobile_ceu_camera.c +++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c @@ -142,7 +142,7 @@ static void free_buffer(struct videobuf_queue *vq, { struct soc_camera_device *icd = vq->priv_data; - dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__, + dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__, &buf->vb, buf->vb.baddr, buf->vb.bsize); if (in_interrupt()) @@ -179,7 +179,7 @@ static int sh_mobile_ceu_videobuf_prepare(struct videobuf_queue *vq, buf = container_of(vb, struct sh_mobile_ceu_buffer, vb); - dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__, + dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__, vb, vb->baddr, vb->bsize); /* Added list head initialization on alloc */ @@ -232,7 +232,7 @@ static void sh_mobile_ceu_videobuf_queue(struct videobuf_queue *vq, struct sh_mobile_ceu_dev *pcdev = ici->priv; unsigned long flags; - dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__, + dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %zd\n", __func__, vb, vb->baddr, vb->bsize); vb->state = VIDEOBUF_ACTIVE; diff --git a/linux/drivers/media/video/videobuf-dma-contig.c b/linux/drivers/media/video/videobuf-dma-contig.c index 2475535cb..c71001da3 100644 --- a/linux/drivers/media/video/videobuf-dma-contig.c +++ b/linux/drivers/media/video/videobuf-dma-contig.c @@ -16,8 +16,10 @@ #include <linux/init.h> #include <linux/module.h> +#include <linux/mm.h> #include <linux/dma-mapping.h> #include <media/videobuf-dma-contig.h> +#include "compat.h" struct videobuf_dma_contig_memory { u32 magic; |