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()

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 */