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/acinterp.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/acinterp.h')
| -rw-r--r-- | drivers/acpi/acpica/acinterp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h index bae1a35c345f..8b09d28fe5a8 100644 --- a/drivers/acpi/acpica/acinterp.h +++ b/drivers/acpi/acpica/acinterp.h @@ -67,7 +67,7 @@ typedef const struct acpi_exdump_info { u8 opcode; u8 offset; - char *name; + const char *name; } acpi_exdump_info; |