summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-25 10:12:46 +0400
committerLen Brown <len.brown@intel.com>2010-10-25 10:12:46 +0400
commite000f8f72908e2ae924ec3900f2c0e18e76d26da (patch)
tree0573d01fc988ca669ed8f9caca634422e946b821 /include/acpi
parent38add9b4baec61655228d86b8d0caa62f15fd857 (diff)
parent761afb869f649ea23e2dea7bfe9b550d3a1b7631 (diff)
downloadlinux-e000f8f72908e2ae924ec3900f2c0e18e76d26da.tar.xz
Merge branch 'acpi_pm_device_sleep_state' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index a47bb908ddcd..359ef11725a6 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -389,21 +389,25 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
int acpi_disable_wakeup_device_power(struct acpi_device *dev);
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM_OPS
int acpi_pm_device_sleep_state(struct device *, int *);
-int acpi_pm_device_sleep_wake(struct device *, bool);
-#else /* !CONFIG_PM_SLEEP */
+#else
static inline int acpi_pm_device_sleep_state(struct device *d, int *p)
{
if (p)
*p = ACPI_STATE_D0;
return ACPI_STATE_D3;
}
+#endif
+
+#ifdef CONFIG_PM_SLEEP
+int acpi_pm_device_sleep_wake(struct device *, bool);
+#else
static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
{
return -ENODEV;
}
-#endif /* !CONFIG_PM_SLEEP */
+#endif
#endif /* CONFIG_ACPI */