Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'

[mirror_ubuntu-artful-kernel.git] / include / acpi / acpi_bus.h

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index ad0a5ff3d4cd724128b36074d428f475155df1b4..14362a84c78e3ca1d5712d284d6dce22ed656ba1 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -87,6 +87,8 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func,
          .package.elements = (eles)                    \
        }
 
+bool acpi_dev_present(const char *hid);
+
 #ifdef CONFIG_ACPI
 
 #include <linux/proc_fs.h>
@@ -631,7 +633,9 @@ static inline bool acpi_device_can_wakeup(struct acpi_device *adev)
 
 static inline bool acpi_device_can_poweroff(struct acpi_device *adev)
 {
-       return adev->power.states[ACPI_STATE_D3_COLD].flags.valid;
+       return adev->power.states[ACPI_STATE_D3_COLD].flags.valid ||
+               ((acpi_gbl_FADT.header.revision < 6) &&
+               adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);
 }
 
 #else  /* CONFIG_ACPI */