---

yaml --- r: 223153 b: refs/heads/master c: 091aad6 h: refs/heads/master i: 223151: c5e254f v: v3
git-mirror · Dec 11, 2010 · d27aeaa · d27aeaa
1 parent 35f489b
commit d27aeaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c3ec4f1f70ee87833363166b594855631d7ba6
+refs/heads/master: 091aad6af4ab29af693ced5d6970ceee9d5981c8
diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c
@@ -27,8 +27,6 @@
 
 static 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)
 {
 	union acpi_object in_arg = { ACPI_TYPE_INTEGER };
@@ -81,6 +79,8 @@ static int acpi_sleep_prepare(u32 acpi_state)
 }
 
 #ifdef CONFIG_ACPI_SLEEP
+static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+
 /*
  * The ACPI specification wants us to save NVS memory regions during hibernation
  * and to restore them during the subsequent resume.  Windows does that also for