diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 12:03:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 12:03:39 +1100 |
| commit | e3f689e0b0413c28d4e03b30e523bbbeb5dc4f11 (patch) | |
| tree | 895a98c81dfe05531a70a2ca4d55511c9b7baf59 /arch/x86/kernel/acpi/sleep.c | |
| parent | b32e1608b4c46ee532aec34fb4ba8c88eb425f9b (diff) | |
| parent | 494c0adea72358282df95c38c30fc0bffc64255b (diff) | |
Merge commit 'acpi/test'
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -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 806b4e9051b4..707c1f6f95fa 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"); |