summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-24 22:26:19 -0400
committerLen Brown <len.brown@intel.com>2007-08-24 22:26:19 -0400
commit519ef1af47bb7379c4c06aeba2d78073df92c151 (patch)
tree252d5f5a3b8b9209bb2b6b022a44f1597329dedb /Documentation
parentb7011d538625dd89f6b0785d9225c5726550f6f1 (diff)
parent2db9ccba8d4bb8e3aa6d0cd8e7544c5736963bbc (diff)
downloadlinux-519ef1af47bb7379c4c06aeba2d78073df92c151.tar.bz2
Pull thermal into release branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
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
-1: disable all active trip points in all thermal zones
<degrees C>: override all lowest active trip points
+ thermal.crt= [HW,ACPI]
+ -1: disable all critical trip points in all thermal zones
+ <degrees C>: lower all critical trip points
+
thermal.nocrt= [HW,ACPI]
Set to disable actions on ACPI thermal zone
critical and hot trip points.