1 files changed, 0 insertions, 36 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 75c37e4c3d75..274b32d12532 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -108,42 +108,6 @@ Who:	Pavel Machek <pavel@ucw.cz>
 
 ---------------------------
 
-What:   Video4Linux obsolete drivers using V4L1 API
-When:   kernel 2.6.39
-Files:  drivers/staging/se401/* drivers/staging/usbvideo/*
-Check:  drivers/staging/se401/se401.c drivers/staging/usbvideo/usbvideo.c
-Why:    There are some drivers still using V4L1 API, despite all efforts we've done
-        to migrate. Those drivers are for obsolete hardware that the old maintainer
-        didn't care (or not have the hardware anymore), and that no other developer
-        could find any hardware to buy. They probably have no practical usage today,
-        and people with such old hardware could probably keep using an older version
-        of the kernel. Those drivers will be moved to staging on 2.6.38 and, if nobody
-        cares enough to port and test them with V4L2 API, they'll be removed on 2.6.39.
-Who:    Mauro Carvalho Chehab <mchehab@infradead.org>
-
----------------------------
-
-What:   Video4Linux: Remove obsolete ioctl's
-When:   kernel 2.6.39
-Files:  include/media/videodev2.h
-Why:    Some ioctl's were defined wrong on 2.6.2 and 2.6.6, using the wrong
-        type of R/W arguments. They were fixed, but the old ioctl names are
-        still there, maintained to avoid breaking binary compatibility:
-          #define VIDIOC_OVERLAY_OLD    _IOWR('V', 14, int)
-          #define VIDIOC_S_PARM_OLD     _IOW('V', 22, struct v4l2_streamparm)
-          #define VIDIOC_S_CTRL_OLD     _IOW('V', 28, struct v4l2_control)
-          #define VIDIOC_G_AUDIO_OLD    _IOWR('V', 33, struct v4l2_audio)
-          #define VIDIOC_G_AUDOUT_OLD   _IOWR('V', 49, struct v4l2_audioout)
-          #define VIDIOC_CROPCAP_OLD    _IOR('V', 58, struct v4l2_cropcap)
-        There's no sense on preserving those forever, as it is very doubtful
-        that someone would try to use a such old binary with a modern kernel.
-        Removing them will allow us to remove some magic done at the V4L ioctl
-        handler.
-
-Who:    Mauro Carvalho Chehab <mchehab@infradead.org>
-
----------------------------
-
 What:   sys_sysctl
 When:   September 2010
 Option: CONFIG_SYSCTL_SYSCALL