1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 52a21dafb540..91f801a2e689 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -450,9 +450,9 @@ struct acpi_gpe_event_info {
 struct acpi_gpe_register_info {
         struct acpi_generic_address status_address;     /* Address of status reg */
         struct acpi_generic_address enable_address;     /* Address of enable reg */
+        u16 base_gpe_number;    /* Base GPE number for this register */
         u8 enable_for_wake;     /* GPEs to keep enabled when sleeping */
         u8 enable_for_run;      /* GPEs to keep enabled when running */
-        u8 base_gpe_number;     /* Base GPE number for this register */
 };
 
 /*
@@ -466,11 +466,12 @@ struct acpi_gpe_block_info {
         struct acpi_gpe_xrupt_info *xrupt_block;        /* Backpointer to interrupt block */
         struct acpi_gpe_register_info *register_info;   /* One per GPE register pair */
         struct acpi_gpe_event_info *event_info; /* One for each GPE */
-        struct acpi_generic_address block_address;      /* Base address of the block */
+        u64 address;            /* Base address of the block */
         u32 register_count;     /* Number of register pairs in block */
         u16 gpe_count;          /* Number of individual GPEs in block */
-        u8 block_base_number;   /* Base GPE number for this block */
-        u8 initialized;         /* TRUE if this block is initialized */
+        u16 block_base_number;  /* Base GPE number for this block */
+        u8 space_id;
+        u8 initialized;         /* TRUE if this block is initialized */
 };
 
 /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
@@ -733,7 +734,8 @@ union acpi_parse_value {
 #define ACPI_DASM_MATCHOP               0x06    /* Parent opcode is a Match() operator */
 #define ACPI_DASM_LNOT_PREFIX           0x07    /* Start of a Lnot_equal (etc.) pair of opcodes */
 #define ACPI_DASM_LNOT_SUFFIX           0x08    /* End  of a Lnot_equal (etc.) pair of opcodes */
-#define ACPI_DASM_IGNORE                0x09    /* Not used at this time */
+#define ACPI_DASM_HID_STRING            0x09    /* String is a _HID or _CID */
+#define ACPI_DASM_IGNORE                0x0A    /* Not used at this time */
 
 /*
  * Generic operation (for example:  If, While, Store)
@@ -1147,4 +1149,9 @@ struct ah_predefined_name {
 #endif
 };
 
+struct ah_device_id {
+        char *name;
+        char *description;
+};
+
 #endif                          /* __ACLOCAL_H__ */