summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorShuah Khan <shuah.kh@samsung.com>2014-02-12 20:19:09 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-13 15:13:45 +0100
commit15029dd7948c4a7adc0860e1750a2a0bba87c473 (patch)
tree0e155602cdd2ced2795a21228e76cd96658c9807 /drivers/acpi
parentb108e0ea94a33f85590959a7a7fbcfd6f8ea8ab6 (diff)
downloadop-kernel-dev-15029dd7948c4a7adc0860e1750a2a0bba87c473.zip
op-kernel-dev-15029dd7948c4a7adc0860e1750a2a0bba87c473.tar.gz
ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined
The ACPI SBS driver defines acpi_sbs_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile error when CONFIG_PM_SLEEP is undefined: CC [M] drivers/acpi/sbs.o drivers/acpi/sbs.c:674:8: error: ‘acpi_sbs_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/sbs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index d465ae6..48c92c6 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -668,6 +668,8 @@ static int acpi_sbs_resume(struct device *dev)
acpi_sbs_callback(sbs);
return 0;
}
+#else
+#define acpi_sbs_resume NULL
#endif
static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
OpenPOWER on IntegriCloud