diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 20:07:19 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 20:07:19 +0300 |
| commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
| tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/acpi/acpica/acparser.h | |
| parent | 1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (diff) | |
| parent | 6ca7208569550de43d64db6cf873706c371284a5 (diff) | |
| download | linux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.xz | |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/acpica/acparser.h')
| -rw-r--r-- | drivers/acpi/acpica/acparser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h index 7da639d62416..fc305775c3d7 100644 --- a/drivers/acpi/acpica/acparser.h +++ b/drivers/acpi/acpica/acparser.h @@ -139,7 +139,7 @@ acpi_ps_complete_final_op(struct acpi_walk_state *walk_state, */ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode); -char *acpi_ps_get_opcode_name(u16 opcode); +const char *acpi_ps_get_opcode_name(u16 opcode); u8 acpi_ps_get_argument_count(u32 op_type); |