From: Shuah Khan <shuah.kh@samsung.com>
Date: Thu, 13 Feb 2014 03:19:10 +0000 (-0700)
Subject: ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
X-Git-Tag: v4.9.8~6866^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde;p=platform%2Fkernel%2Flinux-rpi3.git

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>
---

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);