diff options
| -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 | ||||
| -rw-r--r-- | v4l/compat.h | 3 |
3 files changed, 8 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; diff --git a/v4l/compat.h b/v4l/compat.h index af6727e1b..5e46c8271 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -114,6 +114,9 @@ do { \ p->length = sz; \ p->offset = off; \ } while (0) + +#define pr_err(fmt, arg...) \ + printk(KERN_ERR fmt, ##arg) #endif #ifndef BIT_MASK |