Merge branch 'acpi-dev-pm'

* acpi-dev-pm: ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
git-mirror · Dec 7, 2012 · 8ab788f · 8ab788f
2 parents bf58cdf + d71f2f8
commit 8ab788f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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; }
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
 int acpi_dev_pm_attach(struct device *dev, bool power_on);
-int acpi_dev_pm_detach(struct device *dev, bool power_off);
+void acpi_dev_pm_detach(struct device *dev, bool power_off);
 #else
 static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
 {