Merge branch 'acpi-pm'

* acpi-pm:
  spi: attach/detach SPI device to the ACPI power domain
  i2c: attach/detach I2C client device to the ACPI power domain
  ACPI / PM: allow child devices to ignore parent power state
This commit is contained in:
Rafael J. Wysocki
2013-10-28 01:17:49 +01:00
4 changed files with 28 additions and 6 deletions

View File

@@ -222,7 +222,8 @@ struct acpi_device_power_flags {
u32 power_resources:1; /* Power resources */
u32 inrush_current:1; /* Serialize Dx->D0 */
u32 power_removed:1; /* Optimize Dx->D0 */
u32 reserved:28;
u32 ignore_parent:1; /* Power is independent of parent power state */
u32 reserved:27;
};
struct acpi_device_power_state {