Em 28-02-2011 04:28, Hans Verkuil escreveu: > 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. Yes, patch is trivial, but your patch is incomplete ;) The correct one is attached. Btw, videodev2.h still have the definitions for VIDIOC_*_OLD. So, I'm preparing a more complete patch removing the docbook definitions for it. --- matrox: Remove definition for the legacy VIDIOC_*_OLD ioctls Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index a082deb..8c9dbac 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c @@ -101,8 +101,6 @@ #include <linux/version.h> -#define __OLD_VIDIOC_ - #include "matroxfb_base.h" #include "matroxfb_misc.h" #include "matroxfb_accel.h" @@ -1152,7 +1150,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; -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html