From: Shuah Khan Date: Thu, 13 Feb 2014 03:19:07 +0000 (-0700) Subject: ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined X-Git-Tag: v4.9.8~6866^2~1^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2de9fd17c0359fea0c2ab5ae393c40d6d299bcaf;p=platform%2Fkernel%2Flinux-rpi3.git ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined The ACPI button driver defines acpi_button_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined: drivers/acpi/button.c:85:8: error: ‘acpi_button_resume’ undeclared here (not in a function) Signed-off-by: Shuah Khan Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 11c11f6..714e957 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); #ifdef CONFIG_PM_SLEEP static int acpi_button_resume(struct device *dev); +#else +#define acpi_button_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);