From 6d572e4b96d7d5a13754a8a0879333936ae4522e Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 23 Oct 2008 21:46:43 +0200
Subject: [PATCH] --- yaml --- r: 117837 b: refs/heads/master c:
 92daa7b53b76984565dfdfda5d9c679884121fb2 h: refs/heads/master i:   117835:
 9168b1d2a8c848e6ce2ac6e3038dabe1c6b13682 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 e72cb9bd76bf..8b9cfabb045c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cab08969188e2da09923fe9c4a99ec9b934b0708
+refs/heads/master: 92daa7b53b76984565dfdfda5d9c679884121fb2
diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c
index 26571bafb158..80c0868d0480 100644
--- a/trunk/drivers/acpi/sleep/main.c
+++ b/trunk/drivers/acpi/sleep/main.c
@@ -163,6 +163,8 @@ static void acpi_pm_end(void)
 	acpi_target_sleep_state = ACPI_STATE_S0;
 	acpi_sleep_tts_switch(acpi_target_sleep_state);
 }
+#else /* !CONFIG_ACPI_SLEEP */
+#define acpi_target_sleep_state	ACPI_STATE_S0
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND