aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 82d6aeb5228f..2b2407d9a6d0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
254 control method, with respect to putting devices into 254 control method, with respect to putting devices into
255 low power states, to be enforced (the ACPI 2.0 ordering 255 low power states, to be enforced (the ACPI 2.0 ordering
256 of _PTS is used by default). 256 of _PTS is used by default).
257 s4_nonvs prevents the kernel from saving/restoring the 257 nonvs prevents the kernel from saving/restoring the
258 ACPI NVS memory during hibernation. 258 ACPI NVS memory during suspend/hibernation and resume.
259 sci_force_enable causes the kernel to set SCI_EN directly 259 sci_force_enable causes the kernel to set SCI_EN directly
260 on resume from S1/S3 (which is against the ACPI spec, 260 on resume from S1/S3 (which is against the ACPI spec,
261 but some broken systems don't work without it). 261 but some broken systems don't work without it).
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file
1265 If there are multiple matching configurations changing 1265 If there are multiple matching configurations changing
1266 the same attribute, the last one is used. 1266 the same attribute, the last one is used.
1267 1267
1268 lmb=debug [KNL] Enable lmb debug messages. 1268 memblock=debug [KNL] Enable memblock debug messages.
1269 1269
1270 load_ramdisk= [RAM] List of ramdisks to load from floppy 1270 load_ramdisk= [RAM] List of ramdisks to load from floppy
1271 See Documentation/blockdev/ramdisk.txt. 1271 See Documentation/blockdev/ramdisk.txt.