Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[pandora-kernel.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bf56b20..4ab4c42 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -46,15 +46,6 @@ Who: Jody McIntyre <scjody@modernduck.com>
 
 ---------------------------
 
-What:  sbp2: module parameter "force_inquiry_hack"
-When:  July 2006
-Why:   Superceded by parameter "workarounds". Both parameters are meant to be
-       used ad-hoc and for single devices only, i.e. not in modprobe.conf,
-       therefore the impact of this feature replacement should be low.
-Who:   Stefan Richter <stefanr@s5r6.in-berlin.de>
-
----------------------------
-
 What:  Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:  July 2006
 Why:   V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
@@ -70,6 +61,18 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
 ---------------------------
 
+What:  sys_sysctl
+When:  January 2007
+Why:   The same information is available through /proc/sys and that is the
+       interface user space prefers to use. And there do not appear to be
+       any existing user in user space of sys_sysctl.  The additional
+       maintenance overhead of keeping a set of binary names gets
+       in the way of doing a good job of maintaining this interface.
+
+Who:   Eric Biederman <ebiederm@xmission.com>
+
+---------------------------
+
 What:  PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
 When:  November 2005
 Files: drivers/pcmcia/: pcmcia_ioctl.c
@@ -313,3 +316,12 @@ Why:       The stacking of class devices makes these values misleading and
 Who:   Kay Sievers <kay.sievers@suse.de>
 
 ---------------------------
+
+What:  i2c-isa
+When:  December 2006
+Why:   i2c-isa is a non-sense and doesn't fit in the device driver
+       model. Drivers relying on it are better implemented as platform
+       drivers.
+Who:   Jean Delvare <khali@linux-fr.org>
+
+---------------------------