From: Yuanhan Liu Date: Fri, 26 Oct 2012 11:39:24 +0000 (+0200) Subject: ACPI: move acpi_no_s4_hw_signature() declaration into #ifdef CONFIG_HIBERNATION X-Git-Tag: v3.8-rc1~182^2~13^2~26 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9743fdea9f9473cd2440741342a5ed8e19eb51bd;p=~emulex%2Finfiniband.git 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 Reviewed-by: Fengguang Wu Signed-off-by: Rafael J. Wysocki --- diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3cf93491125..87edfcc0ab6 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);