From: Shuah Khan Date: Thu, 13 Feb 2014 03:19:06 +0000 (-0700) Subject: ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined X-Git-Tag: v3.14-rc4~17^2~1^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f6895c60f40354b5adf0320ea5ef8e47cf475c9;p=kernel%2Fkernel-generic.git ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined The ACPI battery driver defines acpi_battery_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined: drivers/acpi/battery.c:847:8: error: ‘acpi_battery_resume’ undeclared here (not in a function) Signed-off-by: Shuah Khan Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 018a428..797a693 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) acpi_battery_update(battery); return 0; } +#else +#define acpi_battery_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);