diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-23 21:01:02 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-07-26 19:25:08 -0400 |
| commit | a5ca7345c1e67cd12cf75a9ec034c7d34786ae79 (patch) | |
| tree | 46c6174ed1755d8623a4481031f9da6089bc1a62 /drivers/acpi | |
| parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) | |
| download | op-kernel-dev-a5ca7345c1e67cd12cf75a9ec034c7d34786ae79.zip op-kernel-dev-a5ca7345c1e67cd12cf75a9ec034c7d34786ae79.tar.gz | |
ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 88561029..dca8074 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -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 |
