diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 17:14:11 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 17:14:11 -0500 |
| commit | 8ab788f00263e886a5ac74b51ee0a226e4363795 (patch) | |
| tree | 4fb0e0a6c39cf991c415de4148728bfddca029f7 | |
| parent | bf58cdffac931ff387c657395742a737837b93ca (diff) | |
| parent | d71f2f88825b31553881944959962b1871099e1f (diff) | |
Merge branch 'acpi-dev-pm'
* acpi-dev-pm:
ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0f8022baf3fd..c33fa3ce9b7c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -511,7 +511,7 @@ static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } | |||
| 511 | 511 | ||
| 512 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) | 512 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) |
| 513 | int acpi_dev_pm_attach(struct device *dev, bool power_on); | 513 | int acpi_dev_pm_attach(struct device *dev, bool power_on); |
| 514 | int acpi_dev_pm_detach(struct device *dev, bool power_off); | 514 | void acpi_dev_pm_detach(struct device *dev, bool power_off); |
| 515 | #else | 515 | #else |
| 516 | static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) | 516 | static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) |
| 517 | { | 517 | { |