diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-25 02:13:09 -0400 |
| commit | 6e04c417aed5b0a5bd6ae80928bbd759fa1faabc (patch) | |
| tree | be657ff1734320850c2ea37d4336b576f07dca31 /drivers/acpi/acpica/aclocal.h | |
| parent | 880308089d0abebac365c3a1378b4e3238b100ac (diff) | |
| parent | a210080195c95ebca2a517ee3057d71607aa65e0 (diff) | |
| download | blackbird-op-linux-6e04c417aed5b0a5bd6ae80928bbd759fa1faabc.tar.gz blackbird-op-linux-6e04c417aed5b0a5bd6ae80928bbd759fa1faabc.zip | |
Merge branch 'gpe-defer' into release
Diffstat (limited to 'drivers/acpi/acpica/aclocal.h')
| -rw-r--r-- | drivers/acpi/acpica/aclocal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 8acf1e8e479f..2ceb0c05b2d7 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -413,6 +413,7 @@ struct acpi_handler_info { void *context; /* Context to be passed to handler */ struct acpi_namespace_node *method_node; /* Method node for this GPE level (saved) */ u8 orig_flags; /* Original misc info about this GPE */ + u8 orig_enabled; /* Set if the GPE was originally enabled */ }; union acpi_gpe_dispatch_info { @@ -457,6 +458,7 @@ struct acpi_gpe_block_info { 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; /* If set, the GPE block has been initialized */ }; /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */ @@ -473,7 +475,6 @@ struct acpi_gpe_walk_info { struct acpi_gpe_block_info *gpe_block; u16 count; acpi_owner_id owner_id; - u8 enable_this_gpe; u8 execute_by_owner_id; }; |
