summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 13:00:07 +0300
committerLen Brown <len.brown@intel.com>2011-01-12 13:00:07 +0300
commitc1b2dab96f3c1cb051b85d82d7e70e12e9b930f2 (patch)
tree9ef312cd3b4ce583364923ad708168add6059285 /drivers/acpi/Kconfig
parent6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (diff)
parent6d855fcdd24d2491455527c4999b4d04363f1980 (diff)
downloadlinux-c1b2dab96f3c1cb051b85d82d7e70e12e9b930f2.tar.xz
Merge branch 'procfs-cleanup' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 3f3489c5ca8c..788e88eb18ec 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -53,10 +53,6 @@ config ACPI_PROCFS
they have been replaced by functions in /sys.
The deprecated files (and their replacements) include:
- /proc/acpi/processor/*/throttling (/sys/class/thermal/
- cooling_device*/*)
- /proc/acpi/video/*/brightness (/sys/class/backlight/)
- /proc/acpi/thermal_zone/*/* (/sys/class/thermal/)
This option has no effect on /proc/acpi/ files
and functions which do not yet exist in /sys.
@@ -74,6 +70,8 @@ config ACPI_PROCFS_POWER
/proc/acpi/ac_adapter/* (sys/class/power_supply/*)
This option has no effect on /proc/acpi/ directories
and functions, which do not yet exist in /sys
+ This option, together with the proc directories, will be
+ deleted in 2.6.39.
Say N to delete power /proc/acpi/ directories that have moved to /sys/