diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:38:15 -0500 |
commit | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (patch) | |
tree | 82b60e24ce5457e2e21e00bfa3b2f171d7eb97ce /arch/x86/kernel/acpi | |
parent | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (diff) | |
parent | ada9cfdd158abb8169873dc8e5ae39b1ec6ffa8c (diff) |
Merge branch 'suspend' into release
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 806b4e9051b..707c1f6f95f 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -159,6 +159,8 @@ static int __init acpi_sleep_setup(char *str) #endif if (strncmp(str, "old_ordering", 12) == 0) acpi_old_suspend_ordering(); + if (strncmp(str, "s4_nonvs", 8) == 0) + acpi_s4_no_nvs(); str = strchr(str, ','); if (str != NULL) str += strspn(str, ", \t"); |