diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 07:09:19 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 07:13:50 +0100 |
| commit | 17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9 (patch) | |
| tree | a45f944e15a2600ec20ca4ec11b23d4641095e8e /drivers/acpi/thermal.c | |
| parent | Video: atmel: avoid the id of fix screen info is overwritten (diff) | |
| parent | Doc/DT: Add DT binding documentation for tpd12s015 encoder (diff) | |
| download | linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.tar.xz linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.zip | |
Merge branch '3.15/dss-dt' into 3.15/fbdev
Merge OMAP DSS DT support
Diffstat (limited to 'drivers/acpi/thermal.c')
| -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 8349a555b92b..08626c851be7 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); |