[PATCH 2/6] drivers/acpi: fix battery driver compile error when CONFIG_PM_SLEEP is undefined

From: Shuah Khan
Date: Wed Feb 12 2014 - 22:22:04 EST


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 <shuah.kh@xxxxxxxxxxx>
---
drivers/acpi/battery.c | 2 ++
1 file changed, 2 insertions(+)

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);
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/