summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorShuah Khan <shuah.kh@samsung.com>2014-02-12 20:19:06 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-13 15:13:44 +0100
commit7f6895c60f40354b5adf0320ea5ef8e47cf475c9 (patch)
tree09acb93caea1088df26fd0ae7f51502b7dda7f9d /drivers/acpi
parent06521c2e4a049504675f64f0a7e6d882fd364bc1 (diff)
downloadlinux-7f6895c60f40354b5adf0320ea5ef8e47cf475c9.tar.bz2
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 <shuah.kh@samsung.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/battery.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 018a42883706..797a6938d051 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);