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/acglobal.h | |
| parent | 880308089d0abebac365c3a1378b4e3238b100ac (diff) | |
| parent | a210080195c95ebca2a517ee3057d71607aa65e0 (diff) | |
Merge branch 'gpe-defer' into release
Diffstat (limited to 'drivers/acpi/acpica/acglobal.h')
| -rw-r--r-- | drivers/acpi/acpica/acglobal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index b8dbb9bd6962..ad88fcae4eb9 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h | |||
| @@ -370,6 +370,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler | |||
| 370 | ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head; | 370 | ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head; |
| 371 | ACPI_EXTERN struct acpi_gpe_block_info | 371 | ACPI_EXTERN struct acpi_gpe_block_info |
| 372 | *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]; | 372 | *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]; |
| 373 | ACPI_EXTERN u8 acpi_all_gpes_initialized; | ||
| 373 | 374 | ||
| 374 | /***************************************************************************** | 375 | /***************************************************************************** |
| 375 | * | 376 | * |