The patch number 8413 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/sh_mobile_ceu_camera.c | 6 +++---
linux/drivers/media/video/videobuf-dma-contig.c | 2 ++
v4l/compat.h | 3 +++
3 files changed, 8 insertions(+), 3 deletions(-)
diff -r bb7e1607aba0 -r 911df1a096a3
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Fri Jul 18 01:18:19
2008 -0300
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Fri Jul 18 01:19:27
2008 -0300
@@ -142,7 +142,7 @@ static void free_buffer(struct videobuf_
{
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_prepar
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 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 -r bb7e1607aba0 -r 911df1a096a3
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Fri Jul 18 01:18:19
2008 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Fri Jul 18 01:19:27
2008 -0300
@@ -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 -r bb7e1607aba0 -r 911df1a096a3 v4l/compat.h
--- a/v4l/compat.h Fri Jul 18 01:18:19 2008 -0300
+++ b/v4l/compat.h Fri Jul 18 01:19:27 2008 -0300
@@ -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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/911df1a096a339ae7417abd63af04d8b04612051
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
