---

yaml --- r: 117837 b: refs/heads/master c: 92daa7b h: refs/heads/master i: 117835: 9168b1d v: v3
git-mirror · Oct 25, 2008 · 6d572e4 · 6d572e4
1 parent 7ae9f0c
commit 6d572e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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