diff options
| author | Shuah Khan <shuah.kh@samsung.com> | 2014-02-12 20:19:10 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-13 15:13:45 +0100 |
| commit | fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde (patch) | |
| tree | dcb73abb4d56ccc80f84b550ca5496947bc5f399 | |
| parent | 15029dd7948c4a7adc0860e1750a2a0bba87c473 (diff) | |
| download | op-kernel-dev-fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde.zip op-kernel-dev-fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde.tar.gz | |
ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
The ACPI thermal driver defines acpi_thermal_resume() when
CONFIG_PM_SLEEP is defined. This results in the following compile
error when CONFIG_PM_SLEEP is undefined.
CC drivers/acpi/thermal.o
drivers/acpi/thermal.c:107:8: error: ‘acpi_thermal_resume’ undeclared here (not in a function)
make[2]: *** [drivers/acpi/thermal.o] Error 1
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/thermal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 8349a55..08626c8 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -102,6 +102,8 @@ MODULE_DEVICE_TABLE(acpi, thermal_device_ids); #ifdef CONFIG_PM_SLEEP static int acpi_thermal_resume(struct device *dev); +#else +#define acpi_thermal_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume); |
