Messages in this thread Patch in this message |  | | | From | Hans Verkuil <> | | Subject | Re: linux-next: build failure after merge of the v4l-dvb tree | | Date | Mon, 28 Feb 2011 08:28:10 +0100 |
| |
On Monday, February 28, 2011 02:05:01 Stephen Rothwell wrote: > Hi Mauro, > > After merging the v4l-dvb tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl': > drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function) > > Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l: > removal of old, obsolete ioctls"). grep is your friend ... > > I have used the v4l-dvb tree from next-20110225 for today. >
Mauro,
Here is the trivial fix for this. Must remember next time that matrox borrows some of the V4L2 API.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Regards,
Hans
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index a082deb..4c49fb2 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c @@ -1152,7 +1152,6 @@ static int matroxfb_ioctl(struct fb_info *info, return -EFAULT; return err; } - case VIDIOC_S_CTRL_OLD: case VIDIOC_S_CTRL: { struct v4l2_control ctrl; -- Hans Verkuil - video4linux developer - sponsored by Cisco
|  |