From 6dcb3a89e5ead1f70a91195f628a403635cc2246 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 00:45:18 -0400
Subject: [PATCH] --- yaml --- r: 117411 b: refs/heads/master c:
 b849075c0e08ea43400c1341c78eeca76ab08d8a h: refs/heads/master i:   117409:
 beb7b6acca68ed00e8840017f65dca3c270bb152   117407:
 b627579d0b06803aa15e7b16c6686d3fac8faab6 v: v3

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

diff --git a/[refs] b/[refs]
index 191fb9a7019b..500f3ba7f68c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb83f493ab9f8bd09fb7a99ae6ae565e92470491
+refs/heads/master: b849075c0e08ea43400c1341c78eeca76ab08d8a
diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c
index 76037883cd13..26571bafb158 100644
--- a/trunk/drivers/acpi/sleep/main.c
+++ b/trunk/drivers/acpi/sleep/main.c
@@ -24,7 +24,6 @@
 #include "sleep.h"
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
-static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
@@ -78,6 +77,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
 }
 
 #ifdef CONFIG_ACPI_SLEEP
+static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 /*
  * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
  * user to request that behavior by using the 'acpi_old_suspend_ordering'