summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-30 15:55:19 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-30 15:55:19 +0200
commit52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6 (patch)
tree4dde4eeb3f6ce7a4d3b68f4ab9adfc60da519a6e /include/acpi
parentc7208164e66f63e3ec1759b98087849286410741 (diff)
parent3022f4de491c096650d55ae9d562a9c811830724 (diff)
downloadlinux-52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6.tar.bz2
Merge branch 'acpi-lpss' into acpi-enumeration
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 84a2e29a2314..7417a16c8d86 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -261,7 +261,8 @@ struct acpi_device_power_flags {
u32 inrush_current:1; /* Serialize Dx->D0 */
u32 power_removed:1; /* Optimize Dx->D0 */
u32 ignore_parent:1; /* Power is independent of parent power state */
- u32 reserved:27;
+ u32 dsw_present:1; /* _DSW present? */
+ u32 reserved:26;
};
struct acpi_device_power_state {