1 files changed, 0 insertions, 4 deletions

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 63ffd78824d8..b2400d7296ce 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
@@ -278,7 +275,6 @@ Code  Seq#(hex)	Include File		Comments
                                         <mailto:oe@port.de>
 'z'     10-4F   drivers/s390/crypto/zcrypt_api.h        conflict!
 0x80    00-1F   linux/fb.h
-0x88    00-3F   media/ovcamchip.h
 0x89    00-06   arch/x86/include/asm/sockios.h
 0x89    0B-DF   linux/sockios.h
 0x89    E0-EF   linux/sockios.h         SIOCPROTOPRIVATE range