diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:17:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:17:49 +0100 |
| commit | dd6c26be3bb3e98d4811780f831bbc246dae54c8 (patch) | |
| tree | 5b0cce644ee725386b2c4539afc91459e1913cd9 /include/acpi/acpi_bus.h | |
| parent | c0ced86d38f418448dce1ca8a825dfd16ee9a23a (diff) | |
| parent | 33cf00e5708290f7e57d949219ef443a2aef34e0 (diff) | |
| download | linux-stable-dd6c26be3bb3e98d4811780f831bbc246dae54c8.tar.gz linux-stable-dd6c26be3bb3e98d4811780f831bbc246dae54c8.tar.bz2 linux-stable-dd6c26be3bb3e98d4811780f831bbc246dae54c8.zip | |
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
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index d9019821aa60..15100f625e65 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -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 { |