diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
| commit | 6a8dd80821c215bc49bf6b108e85c1738c82bf43 (patch) | |
| tree | 3c8a42ca07fd69f9e11e0093e9eb041cad82c1c6 /include/linux | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 5993c4670ea2453ef5abb45b312f150e994e6eb9 (diff) | |
Merge branch 'acpi-scan' into acpi-pm
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3994d7790b23..8c1d6f2a2193 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -526,9 +526,14 @@ static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM) +struct acpi_device *acpi_dev_pm_get_node(struct device *dev); int acpi_dev_pm_attach(struct device *dev, bool power_on); void acpi_dev_pm_detach(struct device *dev, bool power_off); #else +static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev) +{ + return NULL; +} static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) { return -ENODEV; |