diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:00:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:00:38 +0200 |
| commit | bdc8f09685a25a12f2f5282f56672ba663ecb88c (patch) | |
| tree | b888dceb25d55ec0cd9790b246cd255c20e57e09 /include/acpi | |
| parent | f4c9f402389977dc852ef4848c7615926306735d (diff) | |
| parent | eff9a4b62b14cf0d9913e3caf1f26f8b7a6105c9 (diff) | |
| download | blackbird-op-linux-bdc8f09685a25a12f2f5282f56672ba663ecb88c.tar.gz blackbird-op-linux-bdc8f09685a25a12f2f5282f56672ba663ecb88c.zip | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan
ACPI: Add CMOS RTC Operation Region handler support
ACPI: Remove unused flags in acpi_device_flags
ACPI: Remove useless initializers
ACPI / battery: Make sure all spaces are in correct places
ACPI: add _STA evaluation at do_acpi_find_child()
ACPI / EC: access user space with get_user()/put_user()
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index cac0dfb2a082..ca081ace2a1d 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -156,12 +156,10 @@ struct acpi_device_flags { u32 dynamic_status:1; u32 removable:1; u32 ejectable:1; - u32 suprise_removal_ok:1; u32 power_manageable:1; - u32 performance_manageable:1; u32 eject_pending:1; u32 match_driver:1; - u32 reserved:24; + u32 reserved:26; }; /* File System */ |
