aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/sleep.c
diff options
context:
space:
mode:
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 /arch/x86/kernel/acpi/sleep.c
parentcccc67a4cf52a952e6371ac75510994e0bddec96 (diff)
parentd7f0eea9e431e1b8b0742a74db1a9490730b2a25 (diff)
downloadmrst-s0i3-test-1201b2a9bec0413188ada1443ece1a52da6dbff4.tar.gz
mrst-s0i3-test-1201b2a9bec0413188ada1443ece1a52da6dbff4.tar.xz
mrst-s0i3-test-1201b2a9bec0413188ada1443ece1a52da6dbff4.zip
Merge branch 'resume-sci-force-bootparam' into release
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
-rw-r--r--arch/x86/kernel/acpi/sleep.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 82e508677b9..f9961034e55 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -162,6 +162,8 @@ static int __init acpi_sleep_setup(char *str)
#endif
if (strncmp(str, "old_ordering", 12) == 0)
acpi_old_suspend_ordering();
+ if (strncmp(str, "sci_force_enable", 16) == 0)
+ acpi_set_sci_en_on_resume();
str = strchr(str, ',');
if (str != NULL)
str += strspn(str, ", \t");