1 files changed, 38 insertions, 29 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 0ba6af02cdaf..c585aa8d62b4 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -50,22 +50,6 @@ Who:	Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
 
 ---------------------------
 
-What:   ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API)
-When:   January 2007
-Why:    There are no projects known to use these exported symbols, except
-        dfg1394 (uses one symbol whose functionality is core-internal now).
-Who:    Stefan Richter <stefanr@s5r6.in-berlin.de>
-
----------------------------
-
-What:   ieee1394's *_oui sysfs attributes (CONFIG_IEEE1394_OUI_DB)
-When:   January 2007
-Files:  drivers/ieee1394/: oui.db, oui2c.sh
-Why:    big size, little value
-Who:    Stefan Richter <stefanr@s5r6.in-berlin.de>
-
----------------------------
-
 What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:   December 2006
 Why:    V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
@@ -186,18 +170,6 @@ Who:	Greg Kroah-Hartman <gregkh@suse.de>
 
 ---------------------------
 
-What:   find_trylock_page
-When:   January 2007
-Why:    The interface no longer has any callers left in the kernel. It
-        is an odd interface (compared with other find_*_page functions), in
-        that it does not take a refcount to the page, only the page lock.
-        It should be replaced with find_get_page or find_lock_page if possible.
-        This feature removal can be reevaluated if users of the interface
-        cannot cleanly use something else.
-Who:    Nick Piggin <npiggin@suse.de>
-
----------------------------
-
 What:   Interrupt only SA_* flags
 When:   Januar 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them
@@ -243,6 +215,13 @@ Who:	Jean Delvare <khali@linux-fr.org>,
 
 ---------------------------
 
+What:  drivers depending on OBSOLETE_OSS
+When:  options in 2.6.22, code in 2.6.24
+Why:   OSS drivers with ALSA replacements
+Who:   Adrian Bunk <bunk@stusta.de>
+
+---------------------------
+
 What:   IPv4 only connection tracking/NAT/helpers
 When:   2.6.22
 Why:    The new layer 3 independant connection tracking replaces the old
@@ -274,6 +253,7 @@ Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 
 ---------------------------
 
+<<<<<<< test:Documentation/feature-removal-schedule.txt
 What:   ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
 When:   2.6.21
 Why:    hotkey.c was an attempt to consolidate multiple drivers that use
@@ -306,11 +286,18 @@ Why:	The ACPI namespace is effectively the symbol list for
         the BIOS can be extracted and disassembled with acpidump
         and iasl as documented in the pmtools package here:
         http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
-
 Who:    Len Brown <len.brown@intel.com>
 
 ---------------------------
 
+What:   ACPI procfs interface
+When:   July 2007
+Why:    After ACPI sysfs conversion, ACPI attributes will be duplicated
+        in sysfs and the ACPI procfs interface should be removed.
+Who:    Zhang Rui <rui.zhang@intel.com>
+
+---------------------------
+
 What:   /proc/acpi/button
 When:   August 2007
 Why:    /proc/acpi/button has been replaced by events to the input layer
@@ -325,3 +312,25 @@ Why:	Unmaintained for years, superceded by JFFS2 for years.
 Who:    Jeff Garzik <jeff@garzik.org>
 
 ---------------------------
+
+What:   sk98lin network driver
+When:   July 2007
+Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
+        replaced by the skge driver. 
+Who:    Stephen Hemminger <shemminger@osdl.org>
+
+---------------------------
+
+What:   Compaq touchscreen device emulation
+When:   Oct 2007
+Files:  drivers/input/tsdev.c
+Why:    The code says it was obsolete when it was written in 2001.
+        tslib is a userspace library which does anything tsdev can do and
+        much more besides in userspace where this code belongs. There is no
+        longer any need for tsdev and applications should have converted to
+        use tslib by now.
+        The name "tsdev" is also extremely confusing and lots of people have
+        it loaded when they don't need/use it.
+Who:    Richard Purdie <rpurdie@rpsys.net>
+
+---------------------------