diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/acpi/acpica/acparser.h | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/acpi/acpica/acparser.h')
| -rw-r--r-- | drivers/acpi/acpica/acparser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h index 74a390c6db16..0cdd2fce493a 100644 --- a/drivers/acpi/acpica/acparser.h +++ b/drivers/acpi/acpica/acparser.h | |||
| @@ -70,6 +70,9 @@ | |||
| 70 | * | 70 | * |
| 71 | *****************************************************************************/ | 71 | *****************************************************************************/ |
| 72 | 72 | ||
| 73 | extern const u8 acpi_gbl_short_op_index[]; | ||
| 74 | extern const u8 acpi_gbl_long_op_index[]; | ||
| 75 | |||
| 73 | /* | 76 | /* |
| 74 | * psxface - Parser external interfaces | 77 | * psxface - Parser external interfaces |
| 75 | */ | 78 | */ |