diff options
| author | Yuanhan Liu | 2012-10-26 13:39:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2012-11-15 00:16:03 +0100 |
| commit | 9743fdea9f9473cd2440741342a5ed8e19eb51bd (patch) | |
| tree | 6179b28d24adc4892ef5daaad6c2f853de357adb /include/linux/acpi.h | |
| parent | ACPI / Sleep: add acpi_sleep=nonvs_s3 parameter (diff) | |
| download | kernel-qcow2-linux-9743fdea9f9473cd2440741342a5ed8e19eb51bd.tar.gz kernel-qcow2-linux-9743fdea9f9473cd2440741342a5ed8e19eb51bd.tar.xz kernel-qcow2-linux-9743fdea9f9473cd2440741342a5ed8e19eb51bd.zip | |
ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION
acpi_no_s4_hw_signature is defined in #ifdef CONFIG_HIBERNATION block,
but the current code put the declaration in #ifdef CONFIG_PM_SLEEP block.
I happened to meet this issue when I turned off PM_SLEEP config manually:
arch/x86/kernel/acpi/sleep.c:100:4: error: implicit declaration of function ‘acpi_no_s4_hw_signature’ [-Werror=implicit-function-declaration]
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3cf93491125c..87edfcc0ab62 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -257,8 +257,11 @@ int acpi_check_region(resource_size_t start, resource_size_t n, int acpi_resources_are_enforced(void); -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_HIBERNATION void __init acpi_no_s4_hw_signature(void); +#endif + +#ifdef CONFIG_PM_SLEEP void __init acpi_old_suspend_ordering(void); void __init acpi_nvs_nosave(void); void __init acpi_nvs_nosave_s3(void); |