Commit 8ab788f0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-dev-pm' 

* acpi-dev-pm:
  ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
parents bf58cdff d71f2f88

include/linux/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{