summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorShuah Khan <shuah.kh@samsung.com>2014-02-12 20:19:07 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-13 15:13:44 +0100
commit2de9fd17c0359fea0c2ab5ae393c40d6d299bcaf (patch)
tree7e23acddfd310586797da95f7159794db0f9f223 /drivers/acpi
parent7f6895c60f40354b5adf0320ea5ef8e47cf475c9 (diff)
downloadop-kernel-dev-2de9fd17c0359fea0c2ab5ae393c40d6d299bcaf.zip
op-kernel-dev-2de9fd17c0359fea0c2ab5ae393c40d6d299bcaf.tar.gz
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 <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/button.c2
1 files changed, 2 insertions, 0 deletions
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);
OpenPOWER on IntegriCloud