aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2010-12-07 14:52:25 +0000
committerLen Brown <len.brown@intel.com>2010-12-11 02:01:48 -0500
commit091aad6af4ab29af693ced5d6970ceee9d5981c8 (patch)
tree06980c86ec8d2a68251d286162176b74bd51adeb /drivers/acpi
parent66c3ec4f1f70ee87833363166b594855631d7ba6 (diff)
downloadkernel_samsung_crespo-091aad6af4ab29af693ced5d6970ceee9d5981c8.zip
kernel_samsung_crespo-091aad6af4ab29af693ced5d6970ceee9d5981c8.tar.gz
kernel_samsung_crespo-091aad6af4ab29af693ced5d6970ceee9d5981c8.tar.bz2
ACPI: eliminate unused variable warning for !ACPI_SLEEP
Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721d93b..2182c55 100644
--- a/drivers/acpi/sleep.c
+++ b/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