Subject: linux-next: ldp build failure

From: Stephen Rothwell <[email-masked]>
Date: Wed, 4 Jun 2008 15:08:19 +1000

Hi Greg,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/media/video/s2255drv.c:1659: error: unknown field 'vidioc_enum_fmt_cap' specified in initializer
drivers/media/video/s2255drv.c:1659: warning: initialization from incompatible pointer type
drivers/media/video/s2255drv.c:1660: error: unknown field 'vidioc_g_fmt_cap' specified in initializer
drivers/media/video/s2255drv.c:1660: warning: initialization from incompatible pointer type
drivers/media/video/s2255drv.c:1661: error: unknown field 'vidioc_try_fmt_cap' specified in initializer
drivers/media/video/s2255drv.c:1661: warning: initialization from incompatible pointer type
drivers/media/video/s2255drv.c:1662: error: unknown field 'vidioc_s_fmt_cap' specified in initializer
drivers/media/video/s2255drv.c:1662: warning: initialization from incompatible pointer type

Caused by commit 7ddf62fca6b9be8867204dfcd062bca43a75bae6 ("V4L/DVB
(7949): videodev: renamed the vidioc_*_fmt_* callbacks") from the v4l-dvb
tree.  I applied the patch below.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

>>From 7072d424c2a66ad1df68b4dc6266fcbbd721532b Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email-masked]>
Date: Wed, 4 Jun 2008 15:06:07 +1000
Subject: [PATCH] ldp: fix fallout from v4l struct element renaming

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/media/video/s2255drv.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index d9abde2..181cb78 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -1656,10 +1656,10 @@ static struct video_device template = {
 	.minor = -1,
 	.release = video_device_release,
 	.vidioc_querycap = vidioc_querycap,
-	.vidioc_enum_fmt_cap = vidioc_enum_fmt_cap,
-	.vidioc_g_fmt_cap = vidioc_g_fmt_cap,
-	.vidioc_try_fmt_cap = vidioc_try_fmt_cap,
-	.vidioc_s_fmt_cap = vidioc_s_fmt_cap,
+	.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_cap,
+	.vidioc_g_fmt_vid_cap = vidioc_g_fmt_cap,
+	.vidioc_try_fmt_vid_cap = vidioc_try_fmt_cap,
+	.vidioc_s_fmt_vid_cap = vidioc_s_fmt_cap,
 	.vidioc_reqbufs = vidioc_reqbufs,
 	.vidioc_querybuf = vidioc_querybuf,
 	.vidioc_qbuf = vidioc_qbuf,
-- 
1.5.5.3