summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuah Khan <shuah.kh@samsung.com>2014-02-12 20:19:08 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-13 15:13:44 +0100
commitb108e0ea94a33f85590959a7a7fbcfd6f8ea8ab6 (patch)
tree393070da4278e49b250c82c186f4b9a509625ee5
parent2de9fd17c0359fea0c2ab5ae393c40d6d299bcaf (diff)
downloadlinux-stable-b108e0ea94a33f85590959a7a7fbcfd6f8ea8ab6.tar.gz
linux-stable-b108e0ea94a33f85590959a7a7fbcfd6f8ea8ab6.tar.bz2
linux-stable-b108e0ea94a33f85590959a7a7fbcfd6f8ea8ab6.zip
ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined
The ACPI fan driver defines acpi_fan_suspend() and acpi_fan_resume() when CONFIG_PM_SLEEP is defined. This results in the following compile errors when CONFIG_PM_SLEEP is undefined: drivers/acpi/fan.c:60:8: error: ‘acpi_fan_suspend’ undeclared here (not in a function) drivers/acpi/fan.c:60:8: error: ‘acpi_fan_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>
-rw-r--r--drivers/acpi/fan.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 1fb62900f32a..09e423f3d8ad 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -55,6 +55,9 @@ MODULE_DEVICE_TABLE(acpi, fan_device_ids);
#ifdef CONFIG_PM_SLEEP
static int acpi_fan_suspend(struct device *dev);
static int acpi_fan_resume(struct device *dev);
+#else
+#define acpi_fan_suspend NULL
+#define acpi_fan_resume NULL
#endif
static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);