Merge branch 'acpica' into acpi-lpss

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6b795bd36383368955925437e7a8a8685356b444..1e33ea00485aa5de73468d3f653b3bb4924fa221 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -531,9 +531,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;