diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
| commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
| tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/acpi/acpica/acresrc.h | |
| parent | Merge branch 'for-4.7/dsm' into libnvdimm-for-next (diff) | |
| parent | nfit: export subsystem ids as attributes (diff) | |
| download | linux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.xz linux-1b982baf75e7d9585967fcfccd05b77bf9054010.zip | |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/acpica/acresrc.h')
| -rw-r--r-- | drivers/acpi/acpica/acresrc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h index 5dd58beafa5c..83e9a296c6ee 100644 --- a/drivers/acpi/acpica/acresrc.h +++ b/drivers/acpi/acpica/acresrc.h @@ -124,7 +124,7 @@ typedef enum { typedef const struct acpi_rsdump_info { u8 opcode; u8 offset; - char *name; + const char *name; const char **pointer; } acpi_rsdump_info; @@ -209,7 +209,7 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node, acpi_status acpi_rs_get_method_data(acpi_handle handle, - char *path, struct acpi_buffer *ret_buffer); + const char *path, struct acpi_buffer *ret_buffer); acpi_status acpi_rs_set_srs_method_data(struct acpi_namespace_node *node, |