Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[mv-sheeva.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 611acc32fdf545be7b3efd88cd6aa26bc852887c..93b10bd784edfb4e3874af611e5de0170814b48a 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -217,14 +217,6 @@ Who:       Nick Piggin <npiggin@suse.de>
 
 ---------------------------
 
-What:  Support for the MIPS EV96100 evaluation board
-When:  September 2006
-Why:   Does no longer build since at least November 15, 2003, apparently
-       no userbase left.
-Who:   Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
 What:  Support for the Momentum / PMC-Sierra Jaguar ATX evaluation board
 When:  September 2006
 Why:   Does no longer build since quite some time, and was never popular,
@@ -321,3 +313,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>
+
+---------------------------