From 933b0124ad04366156cb4793d2530ad791d88ead Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 20 Feb 2019 23:04:28 +0000 Subject: Import ACPICA 20190215. --- source/compiler/aslload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/compiler/aslload.c') diff --git a/source/compiler/aslload.c b/source/compiler/aslload.c index 184f69eb7253..c910358d7efb 100644 --- a/source/compiler/aslload.c +++ b/source/compiler/aslload.c @@ -331,8 +331,8 @@ LdLoadFieldElements ( * The name already exists in this scope * But continue processing the elements */ - AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Child, - Child->Asl.Value.String, ASL_MSG_EXTERN_FOUND_HERE, Node->Op, + AslDualParseOpError (ASL_WARNING, ASL_MSG_NAME_EXISTS, Child, + Child->Asl.Value.String, ASL_MSG_FOUND_HERE, Node->Op, Node->Op->Asl.ExternalName); } } @@ -575,7 +575,7 @@ LdNamespace1Begin ( if (Status == AE_NOT_FOUND) { /* - * This is either a foward reference or the object truly + * This is either a forward reference or the object truly * does not exist. The two cases can only be differentiated * during the cross-reference stage later. Mark the Op/Name * as not-found for now to indicate the need for further -- cgit v1.2.3