On Monday, December 27, 2010 12:38:39 Mauro Carvalho Chehab wrote: > The V4L1 removal patches removed a few ioctls. Update it at the docspace. > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> > > diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt > index 63ffd78..49d7f00 100644 > --- a/Documentation/ioctl/ioctl-number.txt > +++ b/Documentation/ioctl/ioctl-number.txt > @@ -260,14 +260,11 @@ Code Seq#(hex) Include File Comments > 't' 80-8F linux/isdn_ppp.h > 't' 90 linux/toshiba.h > 'u' 00-1F linux/smb_fs.h gone > -'v' all linux/videodev.h conflict! > 'v' 00-1F linux/ext2_fs.h conflict! > 'v' 00-1F linux/fs.h conflict! > 'v' 00-0F linux/sonypi.h conflict! > -'v' C0-CF drivers/media/video/ov511.h conflict! > 'v' C0-DF media/pwc-ioctl.h conflict! > 'v' C0-FF linux/meye.h conflict! > -'v' C0-CF drivers/media/video/zoran/zoran.h conflict! > 'v' D0-DF drivers/media/video/cpia2/cpia2dev.h conflict! > 'w' all CERN SCI driver > 'y' 00-1F packet based user level communications > There is also a line for media/ovcamchip.h in this file that can be removed. The media/rds.h line can also be removed (this is kernel internal only). Ditto for media/bt819.h. All other patches in this series: Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx> BTW, it is probably also a good idea to move the dabusb driver to staging and mark it for removal in 2.6.39. Regards, Hans -- Hans Verkuil - video4linux developer - sponsored by Cisco -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html