---

yaml --- r: 82368 b: refs/heads/master c: 964756a h: refs/heads/master v: v3
git-mirror · Feb 1, 2008 · f55b4e1 · f55b4e1
1 parent 681bc99
commit f55b4e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3010f8caa48ed38679cc32b0d8e84b82cb8d9980
+refs/heads/master: 964756a52f4cf0417d515b7f01eec69db8cb0fe2
diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c
@@ -267,11 +267,6 @@ static void acpi_hibernation_leave(void)
 
 static void acpi_hibernation_finish(void)
 {
-	/*
-	 * If ACPI is not enabled by the BIOS and the boot kernel, we need to
-	 * enable it here.
-	 */
-	acpi_enable();
 	acpi_disable_wakeup_device(ACPI_STATE_S4);
 	acpi_leave_sleep_state(ACPI_STATE_S4);