summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-15 14:38:55 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-15 14:38:55 +0200
commitfaacd5ad83857300df4b7b1814ef2eb963063c14 (patch)
tree57f775901276792de38bea290da3822eba7e1df4 /include/acpi
parent0f57d86787d8b1076ea8f9cbdddda2a46d534a27 (diff)
parent0519ade71852701ec76ee7f8a0b37fe5a5504f98 (diff)
downloadlwn-faacd5ad83857300df4b7b1814ef2eb963063c14.tar.gz
lwn-faacd5ad83857300df4b7b1814ef2eb963063c14.zip
Merge branch 'acpi-scan' into acpi-cca
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 8de4fa90e8c4..da079976971f 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -208,7 +208,8 @@ struct acpi_device_flags {
u32 visited:1;
u32 hotplug_notify:1;
u32 is_dock_station:1;
- u32 reserved:23;
+ u32 of_compatible_ok:1;
+ u32 reserved:22;
};
/* File System */