diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-01-16 23:09:14 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-16 18:15:31 -0500 |
| commit | 5d8b532af9e52ea89208f5ef31889f646e67ba28 (patch) | |
| tree | 9d1b4a506864bcaacf191dabc1e9823003088995 /arch/x86/kernel/acpi/sleep.c | |
| parent | 091d71e023557136e96f0e54f301497a3fc95dc3 (diff) | |
| download | linux-5d8b532af9e52ea89208f5ef31889f646e67ba28.tar.gz linux-5d8b532af9e52ea89208f5ef31889f646e67ba28.tar.bz2 linux-5d8b532af9e52ea89208f5ef31889f646e67ba28.zip | |
ACPI suspend: Fix compilation warnings in drivers/acpi/sleep.c
Fix two compilation warnings in drivers/acpi/sleep.c, one triggered
by unsetting CONFIG_SUSPEND and the other triggered by unsetting
CONFIG_HIBERNATION, by moving some code under the appropriate
#ifdefs .
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 707c1f6f95fa..a60c1f3bcb87 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -156,11 +156,11 @@ static int __init acpi_sleep_setup(char *str) #ifdef CONFIG_HIBERNATION if (strncmp(str, "s4_nohwsig", 10) == 0) acpi_no_s4_hw_signature(); + if (strncmp(str, "s4_nonvs", 8) == 0) + acpi_s4_no_nvs(); #endif if (strncmp(str, "old_ordering", 12) == 0) acpi_old_suspend_ordering(); - if (strncmp(str, "s4_nonvs", 8) == 0) - acpi_s4_no_nvs(); str = strchr(str, ','); if (str != NULL) str += strspn(str, ", \t"); |