Merge branch 'acpi-dev-pm'
* acpi-dev-pm: ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
This commit is contained in:
commit
8ab788f002
|
@ -511,7 +511,7 @@ static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
|
||||||
|
|
||||||
#if defined(CONFIG_ACPI) && defined(CONFIG_PM)
|
#if defined(CONFIG_ACPI) && defined(CONFIG_PM)
|
||||||
int acpi_dev_pm_attach(struct device *dev, bool power_on);
|
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
|
#else
|
||||||
static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
|
static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue