From d45e3babb9b0e0f5d5ccbac3eb5be80305216160 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 4 Oct 2008 00:05:05 +0200
Subject: [PATCH] --- yaml --- r: 117392 b: refs/heads/master c:
 d0c71fe7ebc180f1b7bc7da1d39a07fc19eec768 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/acpi/sleep/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 63ea48047024..ceb400503802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6629105dd03d370fcb31e97bddf223fa4bb651e
+refs/heads/master: d0c71fe7ebc180f1b7bc7da1d39a07fc19eec768
diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c
index c7f0c9cd8701..5419938ef297 100644
--- a/trunk/drivers/acpi/sleep/main.c
+++ b/trunk/drivers/acpi/sleep/main.c
@@ -233,6 +233,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 		break;
 	}
 
+	/* If ACPI is not enabled by the BIOS, we need to enable it here. */
+	acpi_enable();
 	/* Reprogram control registers and execute _BFS */
 	acpi_leave_sleep_state_prep(acpi_state);