Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[pandora-kernel.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 08e0140..88681ac 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -54,17 +54,10 @@ config ACPI_PROCFS
          they have been replaced by functions in /sys.
          The deprecated files (and their replacements) include:
 
-         /proc/acpi/sleep (/sys/power/state)
-         /proc/acpi/info (/sys/module/acpi/parameters/acpica_version)
-         /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
-         /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
-         /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
-         /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
-         /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)
-         /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/
-               cpufreq/*)
          /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.
 
@@ -112,7 +105,7 @@ config ACPI_EC_DEBUGFS
 
          Be aware that using this interface can confuse your Embedded
          Controller in a way that a normal reboot is not enough. You then
-         have to power of your system, and remove the laptop battery for
+         have to power off your system, and remove the laptop battery for
          some seconds.
          An Embedded Controller typically is available on laptops and reads
          sensor values like battery state and temperature.