summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-28 16:17:27 -0400
committerLen Brown <len.brown@intel.com>2010-05-28 16:17:27 -0400
commit91dd6964390b331beb731623cb59c4a933ff8162 (patch)
tree2d22bdbd92e1e642fa4a77be4d4bf4cc5cbba2a9 /arch
parentdc1544ea5d6dfdf29440295788e639e4b44c605a (diff)
parentb6dacf63e9fb2e7a1369843d6cef332f76fca6a3 (diff)
Merge branch 'acpi_enable' into release
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/sleep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index f9961034e557..82e508677b91 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -162,8 +162,6 @@ 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");