summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/acopcode.h
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2015-12-29 06:56:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-01 03:47:35 +0100
commit7910617efb5188c0b8dedab1857b12d078957a79 (patch)
treeecfb79e7c2175a3526f9b10fe5a7559cfa2af7b5 /drivers/acpi/acpica/acopcode.h
parentACPICA: acpiexec/acpinames: Update for error checking macros (diff)
downloadlinux-7910617efb5188c0b8dedab1857b12d078957a79.tar.xz
linux-7910617efb5188c0b8dedab1857b12d078957a79.zip
ACPICA: Concatenate operator: Add extensions to support all ACPI objects
ACPICA commit 3420c1f5e6c6dd4fe51be4d98da69b3197d608df Emits strings for all the object types besides int/str/buf. This simplifies and extends the usefulness of the Printf macros. Link: https://github.com/acpica/acpica/commit/3420c1f5 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/acopcode.h')
-rw-r--r--drivers/acpi/acpica/acopcode.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index f9acf92fa0bc..db71b021e42a 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -223,7 +223,7 @@
#define ARGI_BUFFER_OP ARGI_LIST1 (ARGI_INTEGER)
#define ARGI_BYTE_OP ARGI_INVALID_OPCODE
#define ARGI_BYTELIST_OP ARGI_INVALID_OPCODE
-#define ARGI_CONCAT_OP ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA, ARGI_TARGETREF)
+#define ARGI_CONCAT_OP ARGI_LIST3 (ARGI_ANYTYPE, ARGI_ANYTYPE, ARGI_TARGETREF)
#define ARGI_CONCAT_RES_OP ARGI_LIST3 (ARGI_BUFFER, ARGI_BUFFER, ARGI_TARGETREF)
#define ARGI_COND_REF_OF_OP ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)
#define ARGI_CONNECTFIELD_OP ARGI_INVALID_OPCODE