1 files changed, 16 insertions, 24 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f3da8c0a3af2..d8f36f984faa 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -98,7 +98,7 @@ Who:	Pavel Machek <pavel@ucw.cz>
 ---------------------------
 
 What:   Video4Linux API 1 ioctls and from Video devices.
-When:   July 2009
+When:   kernel 2.6.38
 Files:  include/linux/videodev.h
 Check:  include/linux/videodev.h
 Why:    V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
@@ -116,6 +116,21 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------
 
+What:   Video4Linux obsolete drivers using V4L1 API
+When:   kernel 2.6.38
+Files:  drivers/staging/cpia/* drivers/staging/stradis/*
+Check:  drivers/staging/cpia/cpia.c drivers/staging/stradis/stradis.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.37 and, if nobody
+        care enough to port and test them with V4L2 API, they'll be removed on 2.6.38.
+Who:    Mauro Carvalho Chehab <mchehab@infradead.org>
+
+---------------------------
+
 What:   sys_sysctl
 When:   September 2010
 Option: CONFIG_SYSCTL_SYSCALL
@@ -470,29 +485,6 @@ When:	April 2011
 Why:    Superseded by xt_CT
 Who:    Netfilter developer team <netfilter-devel@vger.kernel.org>
 
----------------------------
-
-What:   video4linux /dev/vtx teletext API support
-When:   2.6.35
-Files:  drivers/media/video/saa5246a.c drivers/media/video/saa5249.c
-        include/linux/videotext.h
-Why:    The vtx device nodes have been superseded by vbi device nodes
-        for many years. No applications exist that use the vtx support.
-        Of the two i2c drivers that actually support this API the saa5249
-        has been impossible to use for a year now and no known hardware
-        that supports this device exists. The saa5246a is theoretically
-        supported by the old mxb boards, but it never actually worked.
-
-        In summary: there is no hardware that can use this API and there
-        are no applications actually implementing this API.
-
-        The vtx support still reserves minors 192-223 and we would really
-        like to reuse those for upcoming new functionality. In the unlikely
-        event that new hardware appears that wants to use the functionality
-        provided by the vtx API, then that functionality should be build
-        around the sliced VBI API instead.
-Who:    Hans Verkuil <hverkuil@xs4all.nl>
-
 ----------------------------
 
 What:   IRQF_DISABLED