summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-12-21 10:03:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-12-21 10:03:16 +0100
commit1027fb0fb94aaaaa36ad58193fc61c36efaced85 (patch)
tree10808022e183c1618e36c4eb7a203877d32fc214 /tools/power
parentACPI / OSI: Add OEM _OSI string to enable dGPU direct output (diff)
parentACPICA: Update version to 20181213 (diff)
downloadlinux-1027fb0fb94aaaaa36ad58193fc61c36efaced85.tar.xz
linux-1027fb0fb94aaaaa36ad58193fc61c36efaced85.zip
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20181213 ACPICA: change coding style to match ACPICA, no functional change ACPICA: Debug output: Add option to display method/object evaluation ACPICA: disassembler: disassemble OEMx tables as AML ACPICA: Add "Windows 2018.2" string in the _OSI support ACPICA: Expressions in package elements are not supported ACPICA: Update buffer-to-string conversions ACPICA: add comments, no functional change ACPICA: Remove defines that use deprecated flag ACPICA: Add "Windows 2018" string in the _OSI support ACPICA: Update version to 20181031 ACPICA: iASL: Enhance error detection ACPICA: iASL: adding definition and disassembly for TPM2 revision 3 ACPICA: Use %d for signed int print formatting instead of %u ACPICA: Debugger: refactor to fix unused variable warning
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/acpi/tools/acpidump/apmain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index db213171f8d9..2d9b94b631cb 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -106,7 +106,7 @@ static int ap_insert_action(char *argument, u32 to_be_done)
current_action++;
if (current_action > AP_MAX_ACTIONS) {
- fprintf(stderr, "Too many table options (max %u)\n",
+ fprintf(stderr, "Too many table options (max %d)\n",
AP_MAX_ACTIONS);
return (-1);
}