diff options
author | Len Brown <len.brown@intel.com> | 2007-08-24 22:26:19 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-24 22:26:19 -0400 |
commit | 519ef1af47bb7379c4c06aeba2d78073df92c151 (patch) | |
tree | 252d5f5a3b8b9209bb2b6b022a44f1597329dedb /Documentation/kernel-parameters.txt | |
parent | b7011d538625dd89f6b0785d9225c5726550f6f1 (diff) | |
parent | 2db9ccba8d4bb8e3aa6d0cd8e7544c5736963bbc (diff) |
Pull thermal into release branch
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 17770b456310..b41cde31d112 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1823,6 +1823,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1823 | -1: disable all active trip points in all thermal zones | 1823 | -1: disable all active trip points in all thermal zones |
1824 | <degrees C>: override all lowest active trip points | 1824 | <degrees C>: override all lowest active trip points |
1825 | 1825 | ||
1826 | thermal.crt= [HW,ACPI] | ||
1827 | -1: disable all critical trip points in all thermal zones | ||
1828 | <degrees C>: lower all critical trip points | ||
1829 | |||
1826 | thermal.nocrt= [HW,ACPI] | 1830 | thermal.nocrt= [HW,ACPI] |
1827 | Set to disable actions on ACPI thermal zone | 1831 | Set to disable actions on ACPI thermal zone |
1828 | critical and hot trip points. | 1832 | critical and hot trip points. |