From d27aeaa192d333f9bd6c53d01a1a59dfe5510878 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 7 Dec 2010 14:52:25 +0000 Subject: [PATCH] --- yaml --- r: 223153 b: refs/heads/master c: 091aad6af4ab29af693ced5d6970ceee9d5981c8 h: refs/heads/master i: 223151: c5e254f13b2206d5b9736440c158d0c8086fae1c v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 943d3c08eca1..006df538e510 100644 --- 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 index 721d93b3ceee..2182c5579230 100644 --- 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