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 6f66a93..88681ac 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -56,6 +56,8 @@ config ACPI_PROCFS
 
          /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.
 
@@ -95,6 +97,24 @@ config ACPI_SYSFS_POWER
        help
          Say N to disable power /sys interface
 
+config ACPI_EC_DEBUGFS
+       tristate "EC read/write access through /sys/kernel/debug/ec"
+       default n
+       help
+         Say N to disable Embedded Controller /sys/kernel/debug interface
+
+         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 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.
+         The kernel accesses the EC through ACPI parsed code provided by BIOS
+         tables. This option allows to access the EC directly without ACPI
+         code being involved.
+         Thus this option is a debug option that helps to write ACPI drivers
+         and can be used to identify ACPI code or EC firmware bugs.
+
 config ACPI_PROC_EVENT
        bool "Deprecated /proc/acpi/event support"
        depends on PROC_FS