Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[~andy/linux] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 93d2c7971df626d6fb2db453b700c2b16a95a199..08e0140920e17caa6864e2bed5884fe93095d8dd 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -104,6 +104,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 of 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
@@ -360,4 +378,13 @@ config ACPI_SBS
          To compile this driver as a module, choose M here:
          the modules will be called sbs and sbshc.
 
+config ACPI_HED
+       tristate "Hardware Error Device"
+       help
+         This driver supports the Hardware Error Device (PNP0C33),
+         which is used to report some hardware errors notified via
+         SCI, mainly the corrected errors.
+
+source "drivers/acpi/apei/Kconfig"
+
 endif  # ACPI