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

[deliverable/linux.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d245c639c2221cae626475d2e418e8dd1afff4dc..66c8b4b165c13936b9c3a2e216561518accde8a7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -26,9 +26,7 @@ Who:  Hans Verkuil <hverkuil@xs4all.nl> and
 
 ---------------------------
 
-What:  /sys/devices/.../power/state
-       dev->power.power_state
-       dpm_runtime_{suspend,resume)()
+What:  dev->power.power_state
 When:  July 2007
 Why:   Broken design for runtime control over driver power states, confusing
        driver-internal runtime power management with:  mechanisms to support