Merge branch 'processor-procfs-2.6.32' into release

[sfrench/cifs-2.6.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7ec7d88c5999573d169233bbf3c82232f6003dbd..dd8729d674e56ef2dfcdc7a7fa320f399b4542c6 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -60,7 +60,11 @@ config ACPI_PROCFS
          /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*/*)
          This option has no effect on /proc/acpi/ files
          and functions which do not yet exist in /sys.
 
@@ -82,6 +86,17 @@ config ACPI_PROCFS_POWER
 
          Say N to delete power /proc/acpi/ directories that have moved to /sys/
 
+config ACPI_POWER_METER
+       tristate "ACPI 4.0 power meter"
+       depends on HWMON
+       help
+         This driver exposes ACPI 4.0 power meters as hardware monitoring
+         devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware
+         and a power meter.
+
+         To compile this driver as a module, choose M here:
+         the module will be called power-meter.
+
 config ACPI_SYSFS_POWER
        bool "Future power /sys interface"
        select POWER_SUPPLY