Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[powerpc.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6da6636..5c88ba1 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,18 @@ be removed from this file.
 
 ---------------------------
 
+What:  V4L2 VIDIOC_G_MPEGCOMP and VIDIOC_S_MPEGCOMP
+When:  October 2007
+Why:   Broken attempt to set MPEG compression parameters. These ioctls are
+       not able to implement the wide variety of parameters that can be set
+       by hardware MPEG encoders. A new MPEG control mechanism was created
+       in kernel 2.6.18 that replaces these ioctls. See the V4L2 specification
+       (section 1.9: Extended controls) for more information on this topic.
+Who:   Hans Verkuil <hverkuil@xs4all.nl> and
+       Mauro Carvalho Chehab <mchehab@infradead.org>
+
+---------------------------
+
 What:  /sys/devices/.../power/state
        dev->power.power_state
        dpm_runtime_{suspend,resume)()
@@ -134,15 +146,6 @@ Who:       Arjan van de Ven <arjan@linux.intel.com>
 
 ---------------------------
 
-What:  mount/umount uevents
-When:  February 2007
-Why:   These events are not correct, and do not properly let userspace know
-       when a file system has been mounted or unmounted.  Userspace should
-       poll the /proc/mounts file instead to detect this properly.
-Who:   Greg Kroah-Hartman <gregkh@suse.de>
-
----------------------------
-
 What:  USB driver API moves to EXPORT_SYMBOL_GPL
 When:  February 2008
 Files: include/linux/usb.h, drivers/usb/core/driver.c