path: root/Documentation
diff options
authorLen Brown <len.brown@intel.com>2009-12-30 18:32:32 -0500
committerLen Brown <len.brown@intel.com>2009-12-30 18:32:32 -0500
commit1201b2a9bec0413188ada1443ece1a52da6dbff4 (patch)
tree95f261a3e24071b24b9b31e4776a96368cd34d4c /Documentation
parentcccc67a4cf52a952e6371ac75510994e0bddec96 (diff)
parentd7f0eea9e431e1b8b0742a74db1a9490730b2a25 (diff)
Merge branch 'resume-sci-force-bootparam' into release
Diffstat (limited to 'Documentation')
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5ba4d9dff113..736d45602886 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -240,7 +240,7 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_sleep= [HW,ACPI] Sleep options
Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
- old_ordering, s4_nonvs }
+ old_ordering, s4_nonvs, sci_force_enable }
See Documentation/power/video.txt for information on
s3_bios and s3_mode.
s3_beep is for debugging; it makes the PC's speaker beep
@@ -253,6 +253,9 @@ and is between 256 and 4096 characters. It is defined in the file
of _PTS is used by default).
s4_nonvs prevents the kernel from saving/restoring the
ACPI NVS memory during hibernation.
+ sci_force_enable causes the kernel to set SCI_EN directly
+ on resume from S1/S3 (which is against the ACPI spec,
+ but some broken systems don't work without it).
acpi_use_timer_override [HW,ACPI]
Use timer override. For some broken Nvidia NF5 boards

Privacy Policy