summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-30 14:14:25 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-30 14:14:25 +0200
commit7bc583d102d6f89c3dc4b502caec6ba03c9d318f (patch)
tree550e6333f2205f006849984b52408ed796bcd0c5 /include/acpi
parentda48afb26b40ebb5d6b0e84793e0662859c7ea20 (diff)
parentf943db40c29f3c82a56956e9ca36f21d6d855db9 (diff)
downloadlinux-7bc583d102d6f89c3dc4b502caec6ba03c9d318f.tar.gz
linux-7bc583d102d6f89c3dc4b502caec6ba03c9d318f.tar.bz2
linux-7bc583d102d6f89c3dc4b502caec6ba03c9d318f.zip
Merge branch 'acpi-hotplug'
* acpi-hotplug: ACPI / hotplug: Remove containers synchronously driver core / ACPI: Avoid device hot remove locking issues
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 22650cd9e72a..02e113bb8b7d 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -167,9 +167,8 @@ struct acpi_device_flags {
u32 removable:1;
u32 ejectable:1;
u32 power_manageable:1;
- u32 eject_pending:1;
u32 match_driver:1;
- u32 reserved:26;
+ u32 reserved:27;
};
/* File System */