summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-07-27 07:11:32 -0700
committerGuenter Roeck <linux@roeck-us.net>2012-07-27 13:59:13 -0700
commit9baeb8fdd7e1e78973ad19a6d7e2bcf7dfeb2498 (patch)
tree8d549abddea8cdd984542a215543fc309a47e927
parent25918f9811eae1d657db2bccdfcb077038d9454c (diff)
downloadblackbird-obmc-linux-9baeb8fdd7e1e78973ad19a6d7e2bcf7dfeb2498.tar.gz
blackbird-obmc-linux-9baeb8fdd7e1e78973ad19a6d7e2bcf7dfeb2498.zip
hwmon: (acpi_power_meter) Fix build warning
Commit c5dec0182256361a3f823316e8fb85263f76efe7 (acpi_power_meter: Use struct dev_pm_ops for power management) introduced the following build warning. It is seen if CONFIG_PM_SLEEP is not defined. acpi_power_meter.c:930:12: warning: acpi_power_meter_resume defined but not used Fix it. Cc: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--drivers/hwmon/acpi_power_meter.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 563c02904ddf..23ab3c496b05 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -927,6 +927,8 @@ static int acpi_power_meter_remove(struct acpi_device *device, int type)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
+
static int acpi_power_meter_resume(struct device *dev)
{
struct acpi_power_meter_resource *resource;
@@ -944,6 +946,8 @@ static int acpi_power_meter_resume(struct device *dev)
return 0;
}
+#endif /* CONFIG_PM_SLEEP */
+
static SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL, acpi_power_meter_resume);
static struct acpi_driver acpi_power_meter_driver = {
OpenPOWER on IntegriCloud