]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 23 Jul 2012 19:01:02 +0000 (21:01 +0200)
committerLen Brown <len.brown@intel.com>
Thu, 26 Jul 2012 23:25:08 +0000 (19:25 -0400)
If CONFIG_ACPI_SLEEP is unset, the compiler complains that
pwr_btn_event_pending is defined but not used.  To silence the
warning, move the definition of pwr_btn_event_pending under an
appropriate #ifdef.

Reported-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sleep.c

index 88561029cca83915bffd7cc1d59e03f28d1fbfb4..dca8074b6704860a72aea58ee59bc9055975417d 100644 (file)
@@ -57,7 +57,6 @@ MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
 MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
 
 static u8 sleep_states[ACPI_S_STATE_COUNT];
-static bool pwr_btn_event_pending;
 
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
@@ -110,6 +109,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
 
 #ifdef CONFIG_ACPI_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+static bool pwr_btn_event_pending;
 
 /*
  * The ACPI specification wants us to save NVS memory regions during hibernation