diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 02:10:40 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:10:40 -0400 |
commit | cbeee13570adfb0af494a07074958e4888c2351c (patch) | |
tree | 998d9ff501c4abe19ebe5c262aa5b7052fa80b72 /drivers/acpi/Kconfig | |
parent | 7ef0143e2f898f9bf675c81bdf0e045c8dd53c57 (diff) | |
parent | b188e4ce3b7965ecc8d45191042cc9d25f6b90ee (diff) |
Merge branch 'processor-procfs-2.6.32' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 2c1cab5642ff..dd8729d674e5 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -60,7 +60,11 @@ config ACPI_PROCFS | |||
60 | /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP) | 60 | /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP) |
61 | /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer) | 61 | /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer) |
62 | /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level) | 62 | /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level) |
63 | 63 | /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*) | |
64 | /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/ | ||
65 | cpufreq/*) | ||
66 | /proc/acpi/processor/*/throttling (/sys/class/thermal/ | ||
67 | cooling_device*/*) | ||
64 | This option has no effect on /proc/acpi/ files | 68 | This option has no effect on /proc/acpi/ files |
65 | and functions which do not yet exist in /sys. | 69 | and functions which do not yet exist in /sys. |
66 | 70 | ||