diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-05-10 15:09:38 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-17 17:19:18 -0400 |
| commit | c3b0795c98c08351567464150db66d11e05d7611 (patch) | |
| tree | c98cb3a10d1987c75375692c375794e9808f2107 /Documentation/kernel-parameters.txt | |
| parent | e762318baae3002944d68220910aef7caffcd065 (diff) | |
PM / ACPI: Remove acpi_sleep=s4_nonvs
acpi_sleep=s4_nonvs is superseded by acpi_sleep=nonvs, so remove it.
Signed-off-by: WANG Cong <amwang@redhat.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index cc85a9278190..259037b873b7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -245,7 +245,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 245 | 245 | ||
| 246 | acpi_sleep= [HW,ACPI] Sleep options | 246 | acpi_sleep= [HW,ACPI] Sleep options |
| 247 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, | 247 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, |
| 248 | old_ordering, s4_nonvs, sci_force_enable } | 248 | old_ordering, nonvs, sci_force_enable } |
| 249 | See Documentation/power/video.txt for information on | 249 | See Documentation/power/video.txt for information on |
| 250 | s3_bios and s3_mode. | 250 | s3_bios and s3_mode. |
| 251 | s3_beep is for debugging; it makes the PC's speaker beep | 251 | s3_beep is for debugging; it makes the PC's speaker beep |