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/acnamesp.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/acnamesp.h')
-rw-r--r-- | drivers/acpi/acpica/acnamesp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h index 022d69cb345a..f33a4ba8e0cb 100644 --- a/drivers/acpi/acpica/acnamesp.h +++ b/drivers/acpi/acpica/acnamesp.h @@ -206,9 +206,10 @@ void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth); void acpi_ns_dump_entry(acpi_handle handle, u32 debug_level); void -acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component); +acpi_ns_dump_pathname(acpi_handle handle, + const char *msg, u32 level, u32 component); -void acpi_ns_print_pathname(u32 num_segments, char *pathname); +void acpi_ns_print_pathname(u32 num_segments, const char *pathname); acpi_status acpi_ns_dump_one_object(acpi_handle obj_handle, |