aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
-rw-r--r--Documentation/pm.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a482fde09bbb..acb010bb087b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1176,6 +1176,10 @@ running once the system is up.
1176 Limit processor to maximum C-state 1176 Limit processor to maximum C-state
1177 max_cstate=9 overrides any DMI blacklist limit. 1177 max_cstate=9 overrides any DMI blacklist limit.
1178 1178
1179 processor.nocst [HW,ACPI]
1180 Ignore the _CST method to determine C-states,
1181 instead using the legacy FADT method
1182
1179 prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk 1183 prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
1180 before loading. 1184 before loading.
1181 See Documentation/ramdisk.txt. 1185 See Documentation/ramdisk.txt.
diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index 2ea1149bf6b0..79c0f32a760e 100644
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -218,7 +218,7 @@ proceed in the opposite direction.
218Q: Who do I contact for additional information about 218Q: Who do I contact for additional information about
219 enabling power management for my specific driver/device? 219 enabling power management for my specific driver/device?
220 220
221ACPI Development mailing list: acpi-devel@lists.sourceforge.net 221ACPI Development mailing list: linux-acpi@vger.kernel.org
222 222
223System Interface -- OBSOLETE, DO NOT USE! 223System Interface -- OBSOLETE, DO NOT USE!
224----------------************************* 224----------------*************************