diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2009-06-01 19:24:26 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2009-06-01 19:24:26 +0000 |
| commit | 2905414949c3df353f28937d0bca568c12636116 (patch) | |
| tree | 156ed9f8c6536a9bfada1c1641fcc1705dbb3751 | |
| parent | 9f8a94ab2f363bbcef2d87ddd20716e12ff0a2d9 (diff) | |
| download | src-2905414949c3df353f28937d0bca568c12636116.tar.gz src-2905414949c3df353f28937d0bca568c12636116.zip | |
Temporarily revert system includes fixups to make future import easier.vendor/acpica/20070320resync
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=193251
svn path=/vendor-sys/acpica/20070320resync/; revision=193254; tag=vendor/acpica/20070320resync
169 files changed, 571 insertions, 571 deletions
diff --git a/common/adfile.c b/common/adfile.c index 732b2bb51e6b..007cc6e8ed82 100644 --- a/common/adfile.c +++ b/common/adfile.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acapps.h> +#include "acpi.h" +#include "acapps.h" #include <stdio.h> #include <string.h> diff --git a/common/adisasm.c b/common/adisasm.c index 843a9a8a23f0..4cafaeaa5cd5 100644 --- a/common/adisasm.c +++ b/common/adisasm.c @@ -115,15 +115,15 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> -#include <contrib/dev/acpica/acapps.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdebug.h" +#include "acdisasm.h" +#include "acdispat.h" +#include "acnamesp.h" +#include "actables.h" +#include "acapps.h" #include <stdio.h> #include <time.h> diff --git a/common/adwalk.c b/common/adwalk.c index 108561cbf82d..d2717326af5c 100644 --- a/common/adwalk.c +++ b/common/adwalk.c @@ -115,14 +115,14 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acapps.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdebug.h" +#include "acdisasm.h" +#include "acdispat.h" +#include "acnamesp.h" +#include "acapps.h" #define _COMPONENT ACPI_TOOLS diff --git a/common/dmrestag.c b/common/dmrestag.c index ed8b36b7df2b..f9e899d3ca4d 100644 --- a/common/dmrestag.c +++ b/common/dmrestag.c @@ -115,11 +115,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "acdisasm.h" +#include "acnamesp.h" +#include "amlcode.h" /* This module used for application-level code only */ diff --git a/common/dmtable.c b/common/dmtable.c index ce4b5f91f60f..5a35838524bc 100644 --- a/common/dmtable.c +++ b/common/dmtable.c @@ -114,9 +114,9 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acdisasm.h" +#include "actables.h" /* This module used for application-level code only */ diff --git a/common/dmtbdump.c b/common/dmtbdump.c index 03ca3239117c..fcae4a0e5dd2 100644 --- a/common/dmtbdump.c +++ b/common/dmtbdump.c @@ -114,9 +114,9 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acdisasm.h" +#include "actables.h" /* This module used for application-level code only */ diff --git a/common/dmtbinfo.c b/common/dmtbinfo.c index 5454005d83ee..cfd50a230138 100644 --- a/common/dmtbinfo.c +++ b/common/dmtbinfo.c @@ -114,8 +114,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acdisasm.h" /* This module used for application-level code only */ diff --git a/compiler/aslanalyze.c b/compiler/aslanalyze.c index 93f2f0bdbe73..a64f0baf546e 100644 --- a/compiler/aslanalyze.c +++ b/compiler/aslanalyze.c @@ -116,10 +116,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acparser.h" +#include "amlcode.h" #include <ctype.h> diff --git a/compiler/aslcodegen.c b/compiler/aslcodegen.c index 25ee7290ed89..64ea11e7d381 100644 --- a/compiler/aslcodegen.c +++ b/compiler/aslcodegen.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcodegen") diff --git a/compiler/aslcompile.c b/compiler/aslcompile.c index eba35527d2c4..dfa839d26ed0 100644 --- a/compiler/aslcompile.c +++ b/compiler/aslcompile.c @@ -117,7 +117,7 @@ #include <stdio.h> #include <time.h> -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslcompile") diff --git a/compiler/aslcompiler.h b/compiler/aslcompiler.h index 64776655ea6b..69640c08d80c 100644 --- a/compiler/aslcompiler.h +++ b/compiler/aslcompiler.h @@ -139,15 +139,15 @@ #include <ctype.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlresrc.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "amlresrc.h" +#include "acdebug.h" /* Compiler headers */ -#include <contrib/dev/acpica/compiler/asldefine.h> -#include <contrib/dev/acpica/compiler/asltypes.h> -#include <contrib/dev/acpica/compiler/aslglobal.h> +#include "asldefine.h" +#include "asltypes.h" +#include "aslglobal.h" /******************************************************************************* diff --git a/compiler/aslcompiler.l b/compiler/aslcompiler.l index 78be4eae638c..f64d98ac852c 100644 --- a/compiler/aslcompiler.l +++ b/compiler/aslcompiler.l @@ -119,7 +119,7 @@ #include <stdlib.h> #include <string.h> -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" YYSTYPE AslCompilerlval; diff --git a/compiler/aslcompiler.y b/compiler/aslcompiler.y index 0b33d38a3f9f..ff7dd81313d0 100644 --- a/compiler/aslcompiler.y +++ b/compiler/aslcompiler.y @@ -124,11 +124,11 @@ */ #define YYINITDEPTH 600 -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslparse") diff --git a/compiler/aslerror.c b/compiler/aslerror.c index 760015893ada..4d306bc55d10 100644 --- a/compiler/aslerror.c +++ b/compiler/aslerror.c @@ -116,7 +116,7 @@ *****************************************************************************/ #define ASL_EXCEPTIONS -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslerror") diff --git a/compiler/aslfiles.c b/compiler/aslfiles.c index 9eace4391f09..b68737b0bdba 100644 --- a/compiler/aslfiles.c +++ b/compiler/aslfiles.c @@ -115,8 +115,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> -#include <contrib/dev/acpica/acapps.h> +#include "aslcompiler.h" +#include "acapps.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfiles") diff --git a/compiler/aslfold.c b/compiler/aslfold.c index d744021741dd..ce1077abd9e7 100644 --- a/compiler/aslfold.c +++ b/compiler/aslfold.c @@ -116,12 +116,12 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acparser.h> +#include "acdispat.h" +#include "acparser.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfold") diff --git a/compiler/asllength.c b/compiler/asllength.c index 056aaeb55da7..595302dec3c0 100644 --- a/compiler/asllength.c +++ b/compiler/asllength.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/asllisting.c b/compiler/asllisting.c index 31f70b89ac51..073a6de071b6 100644 --- a/compiler/asllisting.c +++ b/compiler/asllisting.c @@ -116,11 +116,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "amlcode.h" +#include "acparser.h" +#include "acnamesp.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslisting") diff --git a/compiler/aslload.c b/compiler/aslload.c index ebbc487571f2..aca24a742cd6 100644 --- a/compiler/aslload.c +++ b/compiler/aslload.c @@ -116,10 +116,10 @@ #define __ASLLOAD_C__ -#include <contrib/dev/acpica/compiler/aslcompiler.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "aslcompiler.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acnamesp.h" #include "aslcompiler.y.h" diff --git a/compiler/asllookup.c b/compiler/asllookup.c index a970f12eead1..5b8695358e30 100644 --- a/compiler/asllookup.c +++ b/compiler/asllookup.c @@ -115,13 +115,13 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acparser.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdispat.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslmain.c b/compiler/aslmain.c index 6fe94b453cbe..27b4b81da1a7 100644 --- a/compiler/aslmain.c +++ b/compiler/aslmain.c @@ -118,10 +118,10 @@ #define _DECLARE_GLOBALS -#include <contrib/dev/acpica/compiler/aslcompiler.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> -#include <contrib/dev/acpica/acapps.h> +#include "aslcompiler.h" +#include "acnamesp.h" +#include "actables.h" +#include "acapps.h" #ifdef _DEBUG #include <crtdbg.h> diff --git a/compiler/aslmap.c b/compiler/aslmap.c index 5384d0bfbdb1..af291e2c9723 100644 --- a/compiler/aslmap.c +++ b/compiler/aslmap.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acparser.h> +#include "aslcompiler.h" +#include "amlcode.h" +#include "acparser.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslopcodes.c b/compiler/aslopcodes.c index ae91dc8c1b85..bad356a0964e 100644 --- a/compiler/aslopcodes.c +++ b/compiler/aslopcodes.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslopcodes") diff --git a/compiler/asloperands.c b/compiler/asloperands.c index 8f4500e1d75a..0f9e88f6677a 100644 --- a/compiler/asloperands.c +++ b/compiler/asloperands.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("asloperands") diff --git a/compiler/aslopt.c b/compiler/aslopt.c index 2ea9aeadbcb5..0786bf2dfd49 100644 --- a/compiler/aslopt.c +++ b/compiler/aslopt.c @@ -115,12 +115,12 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acparser.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslresource.c b/compiler/aslresource.c index c33637eb73f6..11b260173ef2 100644 --- a/compiler/aslresource.c +++ b/compiler/aslresource.c @@ -116,9 +116,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/amlcode.h> +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslrestype1.c b/compiler/aslrestype1.c index e3174369cc46..8ede71d7b3c1 100644 --- a/compiler/aslrestype1.c +++ b/compiler/aslrestype1.c @@ -116,7 +116,7 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslrestype2.c b/compiler/aslrestype2.c index c42e4a99b602..2e0c47d2b531 100644 --- a/compiler/aslrestype2.c +++ b/compiler/aslrestype2.c @@ -116,7 +116,7 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslstubs.c b/compiler/aslstubs.c index eb6b12a44219..989f17f4fcc1 100644 --- a/compiler/aslstubs.c +++ b/compiler/aslstubs.c @@ -116,9 +116,9 @@ *****************************************************************************/ #include <stdio.h> -#include <contrib/dev/acpica/compiler/aslcompiler.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/actables.h> +#include "aslcompiler.h" +#include "acdispat.h" +#include "actables.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslstubs") diff --git a/compiler/asltransform.c b/compiler/asltransform.c index b76a26675426..6fb1659d0953 100644 --- a/compiler/asltransform.c +++ b/compiler/asltransform.c @@ -116,7 +116,7 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/asltree.c b/compiler/asltree.c index db9893dd1cfe..3c4da4ba432d 100644 --- a/compiler/asltree.c +++ b/compiler/asltree.c @@ -116,7 +116,7 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" #define _COMPONENT ACPI_COMPILER diff --git a/compiler/aslutils.c b/compiler/aslutils.c index 5acf1fc6a49a..c98b27082d16 100644 --- a/compiler/aslutils.c +++ b/compiler/aslutils.c @@ -116,10 +116,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/compiler/aslcompiler.h> +#include "aslcompiler.h" #include "aslcompiler.y.h" -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acnamesp.h" +#include "amlcode.h" #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslutils") diff --git a/debugger/dbcmds.c b/debugger/dbcmds.c index 76dd6d96eede..cdcaa7d3c69f 100644 --- a/debugger/dbcmds.c +++ b/debugger/dbcmds.c @@ -115,17 +115,17 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acresrc.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acdispat.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acevents.h" +#include "acdebug.h" +#include "acresrc.h" +#include "acdisasm.h" -#include <contrib/dev/acpica/acparser.h> +#include "acparser.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbdisply.c b/debugger/dbdisply.c index 40133a1e7073..3b05cff3f526 100644 --- a/debugger/dbdisply.c +++ b/debugger/dbdisply.c @@ -115,14 +115,14 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acnamesp.h" +#include "acparser.h" +#include "acinterp.h" +#include "acdebug.h" +#include "acdisasm.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbexec.c b/debugger/dbexec.c index 10e73f6a91fd..b9ac378f35b6 100644 --- a/debugger/dbexec.c +++ b/debugger/dbexec.c @@ -115,9 +115,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acdebug.h" +#include "acnamesp.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbfileio.c b/debugger/dbfileio.c index dc97d7526323..7136e457fbb4 100644 --- a/debugger/dbfileio.c +++ b/debugger/dbfileio.c @@ -116,11 +116,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acdebug.h" +#include "acnamesp.h" +#include "actables.h" +#include "acdisasm.h" #if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER) diff --git a/debugger/dbhistry.c b/debugger/dbhistry.c index f766f4f23ac7..692545734a95 100644 --- a/debugger/dbhistry.c +++ b/debugger/dbhistry.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acdebug.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbinput.c b/debugger/dbinput.c index a7257ade7507..879fc5de1504 100644 --- a/debugger/dbinput.c +++ b/debugger/dbinput.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acdebug.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbstats.c b/debugger/dbstats.c index d7b2cc05c73a..782fa8aee669 100644 --- a/debugger/dbstats.c +++ b/debugger/dbstats.c @@ -115,9 +115,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acdebug.h" +#include "acnamesp.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbutils.c b/debugger/dbutils.c index dd1e67be9606..27fcd1e8d3f7 100644 --- a/debugger/dbutils.c +++ b/debugger/dbutils.c @@ -115,10 +115,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acdebug.h" +#include "acdisasm.h" #ifdef ACPI_DEBUGGER diff --git a/debugger/dbxface.c b/debugger/dbxface.c index 50e1ecb828ab..adfac48657a5 100644 --- a/debugger/dbxface.c +++ b/debugger/dbxface.c @@ -115,10 +115,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdebug.h" +#include "acdisasm.h" #ifdef ACPI_DEBUGGER diff --git a/disassembler/dmbuffer.c b/disassembler/dmbuffer.c index 5540220d345e..3b592550c91d 100644 --- a/disassembler/dmbuffer.c +++ b/disassembler/dmbuffer.c @@ -115,10 +115,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acdisasm.h" +#include "acparser.h" +#include "amlcode.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmnames.c b/disassembler/dmnames.c index 693646216906..fc24fe73f245 100644 --- a/disassembler/dmnames.c +++ b/disassembler/dmnames.c @@ -115,11 +115,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdisasm.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmobject.c b/disassembler/dmobject.c index 7b7d3c3fcbdd..23b80890ed31 100644 --- a/disassembler/dmobject.c +++ b/disassembler/dmobject.c @@ -115,11 +115,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdisasm.h" +#include "acparser.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmopcode.c b/disassembler/dmopcode.c index bdb9eefe72b2..ffde37867b3e 100644 --- a/disassembler/dmopcode.c +++ b/disassembler/dmopcode.c @@ -114,10 +114,10 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdisasm.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmresrc.c b/disassembler/dmresrc.c index 60b78969abca..2fc199931195 100644 --- a/disassembler/dmresrc.c +++ b/disassembler/dmresrc.c @@ -115,9 +115,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdisasm.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmresrcl.c b/disassembler/dmresrcl.c index 1cc375d7c506..0fffafe27943 100644 --- a/disassembler/dmresrcl.c +++ b/disassembler/dmresrcl.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acdisasm.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmresrcs.c b/disassembler/dmresrcs.c index b7df965dc273..44d2a3450d33 100644 --- a/disassembler/dmresrcs.c +++ b/disassembler/dmresrcs.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acdisasm.h" #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmutils.c b/disassembler/dmutils.c index e6340a2d27d0..592a8d958e0f 100644 --- a/disassembler/dmutils.c +++ b/disassembler/dmutils.c @@ -115,12 +115,12 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdisasm.h" #ifdef ACPI_ASL_COMPILER -#include <contrib/dev/acpica/acnamesp.h> +#include <acnamesp.h> #endif #ifdef ACPI_DISASSEMBLER diff --git a/disassembler/dmwalk.c b/disassembler/dmwalk.c index 12c74f4a24cf..9a9e04ff0e29 100644 --- a/disassembler/dmwalk.c +++ b/disassembler/dmwalk.c @@ -115,11 +115,11 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdisasm.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdisasm.h" +#include "acdebug.h" #ifdef ACPI_DISASSEMBLER diff --git a/events/evevent.c b/events/evevent.c index 0e15049f33fe..cdacdf661fe0 100644 --- a/events/evevent.c +++ b/events/evevent.c @@ -114,8 +114,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acevents.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evevent") diff --git a/events/evgpe.c b/events/evgpe.c index d18a1d7dd96b..2b07ff8858d3 100644 --- a/events/evgpe.c +++ b/events/evgpe.c @@ -114,9 +114,9 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evgpe") diff --git a/events/evgpeblk.c b/events/evgpeblk.c index 5e1bdb72197a..2e09e79fe91d 100644 --- a/events/evgpeblk.c +++ b/events/evgpeblk.c @@ -114,9 +114,9 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evgpeblk") diff --git a/events/evmisc.c b/events/evmisc.c index 7000543f114b..7495ab48b66a 100644 --- a/events/evmisc.c +++ b/events/evmisc.c @@ -114,10 +114,10 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evmisc") diff --git a/events/evregion.c b/events/evregion.c index f7071b10c2a2..ca98b5591916 100644 --- a/events/evregion.c +++ b/events/evregion.c @@ -117,10 +117,10 @@ #define __EVREGION_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evregion") diff --git a/events/evrgnini.c b/events/evrgnini.c index 615c3979401c..0f894ddc5dd1 100644 --- a/events/evrgnini.c +++ b/events/evrgnini.c @@ -117,9 +117,9 @@ #define __EVRGNINI_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evrgnini") diff --git a/events/evsci.c b/events/evsci.c index ab81cbb615ac..4619c9f7f616 100644 --- a/events/evsci.c +++ b/events/evsci.c @@ -116,8 +116,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acevents.h" #define _COMPONENT ACPI_EVENTS diff --git a/events/evxface.c b/events/evxface.c index 15fbc9c65047..29dd410cd0a2 100644 --- a/events/evxface.c +++ b/events/evxface.c @@ -117,10 +117,10 @@ #define __EVXFACE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acevents.h" +#include "acinterp.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evxface") diff --git a/events/evxfevnt.c b/events/evxfevnt.c index e90bded5c7ac..6f489b4835d5 100644 --- a/events/evxfevnt.c +++ b/events/evxfevnt.c @@ -117,10 +117,10 @@ #define __EVXFEVNT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" +#include "actables.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evxfevnt") diff --git a/events/evxfregn.c b/events/evxfregn.c index 7058683fae10..22d2cb7404e6 100644 --- a/events/evxfregn.c +++ b/events/evxfregn.c @@ -117,9 +117,9 @@ #define __EVXFREGN_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acevents.h" #define _COMPONENT ACPI_EVENTS ACPI_MODULE_NAME ("evxfregn") diff --git a/hardware/hwacpi.c b/hardware/hwacpi.c index 3c9bce90aac7..075da83797ea 100644 --- a/hardware/hwacpi.c +++ b/hardware/hwacpi.c @@ -117,7 +117,7 @@ #define __HWACPI_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_HARDWARE diff --git a/hardware/hwgpe.c b/hardware/hwgpe.c index d7498e5552ce..8dc34c390031 100644 --- a/hardware/hwgpe.c +++ b/hardware/hwgpe.c @@ -115,8 +115,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acevents.h" #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME ("hwgpe") diff --git a/hardware/hwregs.c b/hardware/hwregs.c index 36cc47bc0cf5..9d3f219869b7 100644 --- a/hardware/hwregs.c +++ b/hardware/hwregs.c @@ -118,9 +118,9 @@ #define __HWREGS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acevents.h" #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME ("hwregs") diff --git a/hardware/hwsleep.c b/hardware/hwsleep.c index 8dad09fc239e..43abb93fdb1e 100644 --- a/hardware/hwsleep.c +++ b/hardware/hwsleep.c @@ -115,8 +115,8 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "actables.h" #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME ("hwsleep") diff --git a/hardware/hwtimer.c b/hardware/hwtimer.c index 78114e5096da..e089e4f9fce5 100644 --- a/hardware/hwtimer.c +++ b/hardware/hwtimer.c @@ -115,7 +115,7 @@ * *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_HARDWARE ACPI_MODULE_NAME ("hwtimer") diff --git a/include/acdisasm.h b/include/acdisasm.h index 4371de78ca32..efd046de9f18 100644 --- a/include/acdisasm.h +++ b/include/acdisasm.h @@ -117,7 +117,7 @@ #ifndef __ACDISASM_H__ #define __ACDISASM_H__ -#include <contrib/dev/acpica/amlresrc.h> +#include "amlresrc.h" #define BLOCK_NONE 0 diff --git a/include/acpi.h b/include/acpi.h index b0f7848f4622..6d02771ffa6e 100644 --- a/include/acpi.h +++ b/include/acpi.h @@ -122,22 +122,22 @@ * We put them here because we don't want to duplicate them * in the rest of the source code again and again. */ -#include <contrib/dev/acpica/acnames.h> /* Global ACPI names and strings */ -#include <contrib/dev/acpica/acconfig.h> /* Configuration constants */ -#include <contrib/dev/acpica/acenv.h> /* Target environment specific items */ -#include <contrib/dev/acpica/actypes.h> /* Fundamental common data types */ -#include <contrib/dev/acpica/acexcep.h> /* ACPI exception codes */ -#include <contrib/dev/acpica/acmacros.h> /* C macros */ -#include <contrib/dev/acpica/actbl.h> /* ACPI table definitions */ -#include <contrib/dev/acpica/aclocal.h> /* Internal data types */ -#include <contrib/dev/acpica/acoutput.h> /* Error output and Debug macros */ -#include <contrib/dev/acpica/acpiosxf.h> /* Interfaces to the ACPI-to-OS layer*/ -#include <contrib/dev/acpica/acpixf.h> /* ACPI core subsystem external interfaces */ -#include <contrib/dev/acpica/acobject.h> /* ACPI internal object */ -#include <contrib/dev/acpica/acstruct.h> /* Common structures */ -#include <contrib/dev/acpica/acglobal.h> /* All global variables */ -#include <contrib/dev/acpica/achware.h> /* Hardware defines and interfaces */ -#include <contrib/dev/acpica/acutils.h> /* Utility interfaces */ +#include "acnames.h" /* Global ACPI names and strings */ +#include "acconfig.h" /* Configuration constants */ +#include "platform/acenv.h" /* Target environment specific items */ +#include "actypes.h" /* Fundamental common data types */ +#include "acexcep.h" /* ACPI exception codes */ +#include "acmacros.h" /* C macros */ +#include "actbl.h" /* ACPI table definitions */ +#include "aclocal.h" /* Internal data types */ +#include "acoutput.h" /* Error output and Debug macros */ +#include "acpiosxf.h" /* Interfaces to the ACPI-to-OS layer*/ +#include "acpixf.h" /* ACPI core subsystem external interfaces */ +#include "acobject.h" /* ACPI internal object */ +#include "acstruct.h" /* Common structures */ +#include "acglobal.h" /* All global variables */ +#include "achware.h" /* Hardware defines and interfaces */ +#include "acutils.h" /* Utility interfaces */ #endif /* __ACPI_H__ */ diff --git a/include/acpiosxf.h b/include/acpiosxf.h index 69997d885f76..b49b1322f652 100644 --- a/include/acpiosxf.h +++ b/include/acpiosxf.h @@ -121,8 +121,8 @@ #ifndef __ACPIOSXF_H__ #define __ACPIOSXF_H__ -#include <contrib/dev/acpica/acenv.h> -#include <contrib/dev/acpica/actypes.h> +#include "platform/acenv.h" +#include "actypes.h" /* Types for AcpiOsExecute */ diff --git a/include/acpixf.h b/include/acpixf.h index f85fd67d77cd..d2f45950aff8 100644 --- a/include/acpixf.h +++ b/include/acpixf.h @@ -118,8 +118,8 @@ #ifndef __ACXFACE_H__ #define __ACXFACE_H__ -#include <contrib/dev/acpica/actypes.h> -#include <contrib/dev/acpica/actbl.h> +#include "actypes.h" +#include "actbl.h" /* diff --git a/include/acresrc.h b/include/acresrc.h index 345c21e5f7de..6c67c39ac7f8 100644 --- a/include/acresrc.h +++ b/include/acresrc.h @@ -120,7 +120,7 @@ /* Need the AML resource descriptor structs */ -#include <contrib/dev/acpica/amlresrc.h> +#include "amlresrc.h" /* diff --git a/include/actbl.h b/include/actbl.h index 41859ff0f300..e24730b782e9 100644 --- a/include/actbl.h +++ b/include/actbl.h @@ -386,7 +386,7 @@ enum AcpiPreferedPmProfiles /* * Get the remaining ACPI tables */ -#include <contrib/dev/acpica/actbl1.h> +#include "actbl1.h" /* Macros used to generate offsets to specific table fields */ diff --git a/include/platform/acenv.h b/include/platform/acenv.h index 7ae10429a099..559afa6b3b8e 100644 --- a/include/platform/acenv.h +++ b/include/platform/acenv.h @@ -227,7 +227,7 @@ #include "acdos16.h" #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#include <contrib/dev/acpica/acfreebsd.h> +#include "acfreebsd.h" #elif defined(__NetBSD__) #include "acnetbsd.h" diff --git a/include/platform/acfreebsd.h b/include/platform/acfreebsd.h index bc22ba2e08a3..cd64fcc43837 100644 --- a/include/platform/acfreebsd.h +++ b/include/platform/acfreebsd.h @@ -120,7 +120,7 @@ /* FreeBSD uses GCC */ -#include <contrib/dev/acpica/acgcc.h> +#include "acgcc.h" #include <sys/types.h> #include <machine/acpica_machdep.h> diff --git a/interpreter/dispatcher/dsfield.c b/interpreter/dispatcher/dsfield.c index a13fe1d7bb5e..8a9caba627d3 100644 --- a/interpreter/dispatcher/dsfield.c +++ b/interpreter/dispatcher/dsfield.c @@ -116,12 +116,12 @@ #define __DSFIELD_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acparser.h" #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dsinit.c b/interpreter/dispatcher/dsinit.c index 32335e515ef4..7a922da90ab3 100644 --- a/interpreter/dispatcher/dsinit.c +++ b/interpreter/dispatcher/dsinit.c @@ -116,10 +116,10 @@ #define __DSINIT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acdispat.h" +#include "acnamesp.h" +#include "actables.h" #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsinit") diff --git a/interpreter/dispatcher/dsmethod.c b/interpreter/dispatcher/dsmethod.c index 514f3a145c09..0db4eae0da3f 100644 --- a/interpreter/dispatcher/dsmethod.c +++ b/interpreter/dispatcher/dsmethod.c @@ -116,13 +116,13 @@ #define __DSMETHOD_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdisasm.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acdisasm.h" #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dsmthdat.c b/interpreter/dispatcher/dsmthdat.c index 10c1a9bba7fe..2bee88613ff1 100644 --- a/interpreter/dispatcher/dsmthdat.c +++ b/interpreter/dispatcher/dsmthdat.c @@ -116,11 +116,11 @@ #define __DSMTHDAT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acdispat.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dsobject.c b/interpreter/dispatcher/dsobject.c index a0582992aed7..368ad61aaa66 100644 --- a/interpreter/dispatcher/dsobject.c +++ b/interpreter/dispatcher/dsobject.c @@ -116,12 +116,12 @@ #define __DSOBJECT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsobject") diff --git a/interpreter/dispatcher/dsopcode.c b/interpreter/dispatcher/dsopcode.c index 7760ac6d51ee..402f21f37d56 100644 --- a/interpreter/dispatcher/dsopcode.c +++ b/interpreter/dispatcher/dsopcode.c @@ -117,13 +117,13 @@ #define __DSOPCODE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acevents.h" #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsopcode") diff --git a/interpreter/dispatcher/dsutils.c b/interpreter/dispatcher/dsutils.c index eb75947b1485..9307bb2e06b8 100644 --- a/interpreter/dispatcher/dsutils.c +++ b/interpreter/dispatcher/dsutils.c @@ -116,13 +116,13 @@ #define __DSUTILS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acdebug.h" #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsutils") diff --git a/interpreter/dispatcher/dswexec.c b/interpreter/dispatcher/dswexec.c index 0eef999e1b6f..f7f431375765 100644 --- a/interpreter/dispatcher/dswexec.c +++ b/interpreter/dispatcher/dswexec.c @@ -117,13 +117,13 @@ #define __DSWEXEC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acdebug.h" #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dswload.c b/interpreter/dispatcher/dswload.c index 7a65942ea2e4..d3ed090cb85c 100644 --- a/interpreter/dispatcher/dswload.c +++ b/interpreter/dispatcher/dswload.c @@ -116,16 +116,16 @@ #define __DSWLOAD_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acevents.h" #ifdef ACPI_ASL_COMPILER -#include <contrib/dev/acpica/acdisasm.h> +#include "acdisasm.h" #endif #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dswscope.c b/interpreter/dispatcher/dswscope.c index fc55f131eba2..be8f8701c003 100644 --- a/interpreter/dispatcher/dswscope.c +++ b/interpreter/dispatcher/dswscope.c @@ -116,8 +116,8 @@ #define __DSWSCOPE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acpi.h" +#include "acdispat.h" #define _COMPONENT ACPI_DISPATCHER diff --git a/interpreter/dispatcher/dswstate.c b/interpreter/dispatcher/dswstate.c index f6f7bd2bdd6e..c5c1169d9e00 100644 --- a/interpreter/dispatcher/dswstate.c +++ b/interpreter/dispatcher/dswstate.c @@ -117,10 +117,10 @@ #define __DSWSTATE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acparser.h" +#include "acdispat.h" +#include "acnamesp.h" #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dswstate") diff --git a/interpreter/executer/exconfig.c b/interpreter/executer/exconfig.c index 60d8b36e049f..af2e2e6ffd46 100644 --- a/interpreter/executer/exconfig.c +++ b/interpreter/executer/exconfig.c @@ -117,13 +117,13 @@ #define __EXCONFIG_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/actables.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acevents.h" +#include "actables.h" +#include "acdispat.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exconvrt.c b/interpreter/executer/exconvrt.c index 17c86c28b7f5..a56b0db0b395 100644 --- a/interpreter/executer/exconvrt.c +++ b/interpreter/executer/exconvrt.c @@ -117,9 +117,9 @@ #define __EXCONVRT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/excreate.c b/interpreter/executer/excreate.c index d237dab403bb..5fed416a36dc 100644 --- a/interpreter/executer/excreate.c +++ b/interpreter/executer/excreate.c @@ -117,12 +117,12 @@ #define __EXCREATE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acevents.h" +#include "actables.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exdump.c b/interpreter/executer/exdump.c index c7d26ae91064..97002b516222 100644 --- a/interpreter/executer/exdump.c +++ b/interpreter/executer/exdump.c @@ -116,11 +116,11 @@ #define __EXDUMP_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acparser.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME ("exdump") diff --git a/interpreter/executer/exfield.c b/interpreter/executer/exfield.c index c4cbf23adc55..75dc4f948f18 100644 --- a/interpreter/executer/exfield.c +++ b/interpreter/executer/exfield.c @@ -117,9 +117,9 @@ #define __EXFIELD_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acdispat.h" +#include "acinterp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exfldio.c b/interpreter/executer/exfldio.c index 1a8631bfafb9..f3e6144ee6d0 100644 --- a/interpreter/executer/exfldio.c +++ b/interpreter/executer/exfldio.c @@ -117,11 +117,11 @@ #define __EXFLDIO_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acevents.h" +#include "acdispat.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exmisc.c b/interpreter/executer/exmisc.c index 11dd35af5965..6302d5eb5e85 100644 --- a/interpreter/executer/exmisc.c +++ b/interpreter/executer/exmisc.c @@ -118,10 +118,10 @@ #define __EXMISC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/amlresrc.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "amlresrc.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exmutex.c b/interpreter/executer/exmutex.c index e1925ece057f..729b173a5036 100644 --- a/interpreter/executer/exmutex.c +++ b/interpreter/executer/exmutex.c @@ -117,9 +117,9 @@ #define __EXMUTEX_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acinterp.h" +#include "acevents.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME ("exmutex") diff --git a/interpreter/executer/exnames.c b/interpreter/executer/exnames.c index 1304adb37631..b5f2ba44a303 100644 --- a/interpreter/executer/exnames.c +++ b/interpreter/executer/exnames.c @@ -117,9 +117,9 @@ #define __EXNAMES_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME ("exnames") diff --git a/interpreter/executer/exoparg1.c b/interpreter/executer/exoparg1.c index 51f34afdabb5..2f4ea43d9940 100644 --- a/interpreter/executer/exoparg1.c +++ b/interpreter/executer/exoparg1.c @@ -117,12 +117,12 @@ #define __EXOPARG1_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acparser.h" +#include "acdispat.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exoparg2.c b/interpreter/executer/exoparg2.c index f7f05e44fbe2..94aca659b9dd 100644 --- a/interpreter/executer/exoparg2.c +++ b/interpreter/executer/exoparg2.c @@ -117,11 +117,11 @@ #define __EXOPARG2_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "acinterp.h" +#include "acevents.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exoparg3.c b/interpreter/executer/exoparg3.c index 926e22a61d0a..a38e00b5b6da 100644 --- a/interpreter/executer/exoparg3.c +++ b/interpreter/executer/exoparg3.c @@ -118,10 +118,10 @@ #define __EXOPARG3_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "acparser.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exoparg6.c b/interpreter/executer/exoparg6.c index e144bcf63fae..b000f013693f 100644 --- a/interpreter/executer/exoparg6.c +++ b/interpreter/executer/exoparg6.c @@ -118,10 +118,10 @@ #define __EXOPARG6_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "acparser.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exprep.c b/interpreter/executer/exprep.c index b67db318d070..158a60a1d06c 100644 --- a/interpreter/executer/exprep.c +++ b/interpreter/executer/exprep.c @@ -117,10 +117,10 @@ #define __EXPREP_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exregion.c b/interpreter/executer/exregion.c index 184ef7d1e188..b23fce7f1c50 100644 --- a/interpreter/executer/exregion.c +++ b/interpreter/executer/exregion.c @@ -118,8 +118,8 @@ #define __EXREGION_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acinterp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exresnte.c b/interpreter/executer/exresnte.c index f5f2e14fa9d6..57dd6524db62 100644 --- a/interpreter/executer/exresnte.c +++ b/interpreter/executer/exresnte.c @@ -117,12 +117,12 @@ #define __EXRESNTE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acparser.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exresolv.c b/interpreter/executer/exresolv.c index b15e86b0ca23..dae1eb4ffefd 100644 --- a/interpreter/executer/exresolv.c +++ b/interpreter/executer/exresolv.c @@ -117,12 +117,12 @@ #define __EXRESOLV_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acparser.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exresop.c b/interpreter/executer/exresop.c index 5bbce151b9ed..562ca41d5808 100644 --- a/interpreter/executer/exresop.c +++ b/interpreter/executer/exresop.c @@ -117,11 +117,11 @@ #define __EXRESOP_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "amlcode.h" +#include "acparser.h" +#include "acinterp.h" +#include "acnamesp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exstore.c b/interpreter/executer/exstore.c index c4eb8915e73b..48fc72a74886 100644 --- a/interpreter/executer/exstore.c +++ b/interpreter/executer/exstore.c @@ -117,12 +117,12 @@ #define __EXSTORE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "acdispat.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acparser.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exstoren.c b/interpreter/executer/exstoren.c index 1f87ab2a2ab1..232db749ee57 100644 --- a/interpreter/executer/exstoren.c +++ b/interpreter/executer/exstoren.c @@ -118,9 +118,9 @@ #define __EXSTOREN_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exstorob.c b/interpreter/executer/exstorob.c index 02daa39759af..4b39b86805ca 100644 --- a/interpreter/executer/exstorob.c +++ b/interpreter/executer/exstorob.c @@ -117,8 +117,8 @@ #define __EXSTOROB_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acinterp.h" #define _COMPONENT ACPI_EXECUTER diff --git a/interpreter/executer/exsystem.c b/interpreter/executer/exsystem.c index 81c92be8a7a5..0512d474077f 100644 --- a/interpreter/executer/exsystem.c +++ b/interpreter/executer/exsystem.c @@ -117,9 +117,9 @@ #define __EXSYSTEM_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acinterp.h" +#include "acevents.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME ("exsystem") diff --git a/interpreter/executer/exutils.c b/interpreter/executer/exutils.c index 2ce75bbb85d8..510a3ad01d91 100644 --- a/interpreter/executer/exutils.c +++ b/interpreter/executer/exutils.c @@ -133,10 +133,10 @@ #define DEFINE_AML_GLOBALS -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acevents.h> +#include "acpi.h" +#include "acinterp.h" +#include "amlcode.h" +#include "acevents.h" #define _COMPONENT ACPI_EXECUTER ACPI_MODULE_NAME ("exutils") diff --git a/interpreter/parser/psargs.c b/interpreter/parser/psargs.c index 3c3991940703..c40b95910500 100644 --- a/interpreter/parser/psargs.c +++ b/interpreter/parser/psargs.c @@ -116,11 +116,11 @@ #define __PSARGS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdispat.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psargs") diff --git a/interpreter/parser/psloop.c b/interpreter/parser/psloop.c index 6c6ce47b1434..9902b4ef8e68 100644 --- a/interpreter/parser/psloop.c +++ b/interpreter/parser/psloop.c @@ -123,10 +123,10 @@ * opcode templates in AmlOpInfo[]. */ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "acdispat.h" +#include "amlcode.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psloop") diff --git a/interpreter/parser/psopcode.c b/interpreter/parser/psopcode.c index fad6d394dcfe..d55e82075e84 100644 --- a/interpreter/parser/psopcode.c +++ b/interpreter/parser/psopcode.c @@ -115,10 +115,10 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acopcode.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "acopcode.h" +#include "amlcode.h" #define _COMPONENT ACPI_PARSER diff --git a/interpreter/parser/psparse.c b/interpreter/parser/psparse.c index e0afab84ed87..8838896c4711 100644 --- a/interpreter/parser/psparse.c +++ b/interpreter/parser/psparse.c @@ -124,12 +124,12 @@ * templates in AmlOpInfo[] */ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acparser.h" +#include "acdispat.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psparse") diff --git a/interpreter/parser/psscope.c b/interpreter/parser/psscope.c index ea0a613b722c..72c063233ba1 100644 --- a/interpreter/parser/psscope.c +++ b/interpreter/parser/psscope.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "acparser.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psscope") diff --git a/interpreter/parser/pstree.c b/interpreter/parser/pstree.c index f6f017021f88..3f6573fb368f 100644 --- a/interpreter/parser/pstree.c +++ b/interpreter/parser/pstree.c @@ -117,9 +117,9 @@ #define __PSTREE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("pstree") diff --git a/interpreter/parser/psutils.c b/interpreter/parser/psutils.c index e8c8cf0d9060..f8785037ef63 100644 --- a/interpreter/parser/psutils.c +++ b/interpreter/parser/psutils.c @@ -115,9 +115,9 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psutils") diff --git a/interpreter/parser/pswalk.c b/interpreter/parser/pswalk.c index af4099faac48..0f2bb3d710cb 100644 --- a/interpreter/parser/pswalk.c +++ b/interpreter/parser/pswalk.c @@ -115,8 +115,8 @@ *****************************************************************************/ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "acparser.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("pswalk") diff --git a/interpreter/parser/psxface.c b/interpreter/parser/psxface.c index b1ff8e8e6858..beae7ba5c1dc 100644 --- a/interpreter/parser/psxface.c +++ b/interpreter/parser/psxface.c @@ -116,10 +116,10 @@ #define __PSXFACE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acparser.h" +#include "acdispat.h" +#include "acinterp.h" #define _COMPONENT ACPI_PARSER diff --git a/namespace/nsaccess.c b/namespace/nsaccess.c index d1b4f734d9dd..b96a37225629 100644 --- a/namespace/nsaccess.c +++ b/namespace/nsaccess.c @@ -116,10 +116,10 @@ #define __NSACCESS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdispat.h> +#include "acpi.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdispat.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsalloc.c b/namespace/nsalloc.c index e6ecf5a40289..713b45a5ff9f 100644 --- a/namespace/nsalloc.c +++ b/namespace/nsalloc.c @@ -117,8 +117,8 @@ #define __NSALLOC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsdump.c b/namespace/nsdump.c index 7c2028a2fb3e..aef546302c27 100644 --- a/namespace/nsdump.c +++ b/namespace/nsdump.c @@ -117,9 +117,9 @@ #define __NSDUMP_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acparser.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsdumpdv.c b/namespace/nsdumpdv.c index 91c6b542f126..47a76af7c4fb 100644 --- a/namespace/nsdumpdv.c +++ b/namespace/nsdumpdv.c @@ -117,7 +117,7 @@ #define __NSDUMPDV_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" /* TBD: This entire module is apparently obsolete and should be removed */ @@ -128,7 +128,7 @@ #ifdef ACPI_OBSOLETE_FUNCTIONS #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) -#include <contrib/dev/acpica/acnamesp.h> +#include "acnamesp.h" /******************************************************************************* * diff --git a/namespace/nseval.c b/namespace/nseval.c index c44af2d904e8..ce5dd1b5c3e1 100644 --- a/namespace/nseval.c +++ b/namespace/nseval.c @@ -117,10 +117,10 @@ #define __NSEVAL_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acparser.h" +#include "acinterp.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsinit.c b/namespace/nsinit.c index e06ccf75eb7f..7e8a0b1928e2 100644 --- a/namespace/nsinit.c +++ b/namespace/nsinit.c @@ -117,10 +117,10 @@ #define __NSXFINIT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acdispat.h" +#include "acinterp.h" #define _COMPONENT ACPI_NAMESPACE ACPI_MODULE_NAME ("nsinit") diff --git a/namespace/nsload.c b/namespace/nsload.c index 07dd567448a1..a0ea5de12e13 100644 --- a/namespace/nsload.c +++ b/namespace/nsload.c @@ -116,10 +116,10 @@ #define __NSLOAD_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acdispat.h" +#include "actables.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsnames.c b/namespace/nsnames.c index 8ff7aafc51f4..0e6bc8eccaa1 100644 --- a/namespace/nsnames.c +++ b/namespace/nsnames.c @@ -116,9 +116,9 @@ #define __NSNAMES_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsobject.c b/namespace/nsobject.c index 622638c1b619..17181647132c 100644 --- a/namespace/nsobject.c +++ b/namespace/nsobject.c @@ -118,8 +118,8 @@ #define __NSOBJECT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsparse.c b/namespace/nsparse.c index 8cb17a712517..2d217d15330b 100644 --- a/namespace/nsparse.c +++ b/namespace/nsparse.c @@ -116,11 +116,11 @@ #define __NSPARSE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdispat.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acparser.h" +#include "acdispat.h" +#include "actables.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nssearch.c b/namespace/nssearch.c index 23d6ec2dddae..305e5d065402 100644 --- a/namespace/nssearch.c +++ b/namespace/nssearch.c @@ -116,8 +116,8 @@ #define __NSSEARCH_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsutils.c b/namespace/nsutils.c index 7aac1f3891d2..eedc0fdace70 100644 --- a/namespace/nsutils.c +++ b/namespace/nsutils.c @@ -117,10 +117,10 @@ #define __NSUTILS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "amlcode.h" +#include "actables.h" #define _COMPONENT ACPI_NAMESPACE ACPI_MODULE_NAME ("nsutils") diff --git a/namespace/nswalk.c b/namespace/nswalk.c index a3ac86c1c89b..d3e7c7f2e3aa 100644 --- a/namespace/nswalk.c +++ b/namespace/nswalk.c @@ -117,8 +117,8 @@ #define __NSWALK_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsxfeval.c b/namespace/nsxfeval.c index 617002ca4849..6112c85f8dc7 100644 --- a/namespace/nsxfeval.c +++ b/namespace/nsxfeval.c @@ -118,9 +118,9 @@ #define __NSXFEVAL_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsxfname.c b/namespace/nsxfname.c index c19f2a94b575..6326865669b7 100644 --- a/namespace/nsxfname.c +++ b/namespace/nsxfname.c @@ -117,8 +117,8 @@ #define __NSXFNAME_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/namespace/nsxfobj.c b/namespace/nsxfobj.c index 3277379b7f93..1c2b44d504c3 100644 --- a/namespace/nsxfobj.c +++ b/namespace/nsxfobj.c @@ -118,8 +118,8 @@ #define __NSXFOBJ_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_NAMESPACE diff --git a/osunixxf.c b/osunixxf.c index 8fc21fc7cdc9..4f3f7346aab9 100644 --- a/osunixxf.c +++ b/osunixxf.c @@ -125,10 +125,10 @@ #include <unistd.h> #include <sys/time.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "amlcode.h" +#include "acparser.h" +#include "acdebug.h" #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME ("osunixxf") diff --git a/resources/rsaddr.c b/resources/rsaddr.c index 6a11937f3a76..440050a3e7d6 100644 --- a/resources/rsaddr.c +++ b/resources/rsaddr.c @@ -116,8 +116,8 @@ #define __RSADDR_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsaddr") diff --git a/resources/rscalc.c b/resources/rscalc.c index d04568abbbb6..e467c0b06aa6 100644 --- a/resources/rscalc.c +++ b/resources/rscalc.c @@ -116,10 +116,10 @@ #define __RSCALC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acresrc.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rscalc") diff --git a/resources/rscreate.c b/resources/rscreate.c index 6b986ea4c1d4..42fc1b2adaab 100644 --- a/resources/rscreate.c +++ b/resources/rscreate.c @@ -117,10 +117,10 @@ #define __RSCREATE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acresrc.h" +#include "amlcode.h" +#include "acnamesp.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rscreate") diff --git a/resources/rsdump.c b/resources/rsdump.c index eec3df9b577d..2c0ebb0b0f1f 100644 --- a/resources/rsdump.c +++ b/resources/rsdump.c @@ -117,8 +117,8 @@ #define __RSDUMP_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsdump") diff --git a/resources/rsinfo.c b/resources/rsinfo.c index f5c1e0b766b1..06f2a0ddafce 100644 --- a/resources/rsinfo.c +++ b/resources/rsinfo.c @@ -116,8 +116,8 @@ #define __RSINFO_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsinfo") diff --git a/resources/rsio.c b/resources/rsio.c index 52229796d036..ca65e5664dc9 100644 --- a/resources/rsio.c +++ b/resources/rsio.c @@ -116,8 +116,8 @@ #define __RSIO_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsio") diff --git a/resources/rsirq.c b/resources/rsirq.c index abf72c6f8821..ddb05f8c9d4d 100644 --- a/resources/rsirq.c +++ b/resources/rsirq.c @@ -116,8 +116,8 @@ #define __RSIRQ_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsirq") diff --git a/resources/rslist.c b/resources/rslist.c index 37a0764e44e7..34b022bb75cd 100644 --- a/resources/rslist.c +++ b/resources/rslist.c @@ -116,8 +116,8 @@ #define __RSLIST_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rslist") diff --git a/resources/rsmemory.c b/resources/rsmemory.c index e4ab62d18269..b19d8cfa59bf 100644 --- a/resources/rsmemory.c +++ b/resources/rsmemory.c @@ -116,8 +116,8 @@ #define __RSMEMORY_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsmemory") diff --git a/resources/rsmisc.c b/resources/rsmisc.c index 6150bdea8603..8d481bf22d23 100644 --- a/resources/rsmisc.c +++ b/resources/rsmisc.c @@ -116,8 +116,8 @@ #define __RSMISC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsmisc") diff --git a/resources/rsutils.c b/resources/rsutils.c index 369eb868852a..62323c23540a 100644 --- a/resources/rsutils.c +++ b/resources/rsutils.c @@ -117,9 +117,9 @@ #define __RSUTILS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acresrc.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acresrc.h" #define _COMPONENT ACPI_RESOURCES diff --git a/resources/rsxface.c b/resources/rsxface.c index a27331e32ad2..87ca719604db 100644 --- a/resources/rsxface.c +++ b/resources/rsxface.c @@ -117,9 +117,9 @@ #define __RSXFACE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acresrc.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acresrc.h" +#include "acnamesp.h" #define _COMPONENT ACPI_RESOURCES ACPI_MODULE_NAME ("rsxface") diff --git a/tables/tbfadt.c b/tables/tbfadt.c index 554e46427516..efa506829cf2 100644 --- a/tables/tbfadt.c +++ b/tables/tbfadt.c @@ -116,8 +116,8 @@ #define __TBFADT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbfadt") diff --git a/tables/tbfind.c b/tables/tbfind.c index be092934e0ee..260f07430c9b 100644 --- a/tables/tbfind.c +++ b/tables/tbfind.c @@ -116,8 +116,8 @@ #define __TBFIND_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbfind") diff --git a/tables/tbinstal.c b/tables/tbinstal.c index fa7170211555..ad3aeff9a97c 100644 --- a/tables/tbinstal.c +++ b/tables/tbinstal.c @@ -117,9 +117,9 @@ #define __TBINSTAL_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES diff --git a/tables/tbutils.c b/tables/tbutils.c index 5b64e2005e5f..a86dbe246c15 100644 --- a/tables/tbutils.c +++ b/tables/tbutils.c @@ -116,8 +116,8 @@ #define __TBUTILS_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbutils") diff --git a/tables/tbxface.c b/tables/tbxface.c index a7a27c696e2f..aad890c9e08a 100644 --- a/tables/tbxface.c +++ b/tables/tbxface.c @@ -117,9 +117,9 @@ #define __TBXFACE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbxface") diff --git a/tables/tbxfroot.c b/tables/tbxfroot.c index afc30adac7fb..1133b7e50b47 100644 --- a/tables/tbxfroot.c +++ b/tables/tbxfroot.c @@ -116,8 +116,8 @@ #define __TBXFROOT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "actables.h" #define _COMPONENT ACPI_TABLES diff --git a/tools/acpiexec/aecommon.h b/tools/acpiexec/aecommon.h index 0dd1e5f65979..bab2b6eb607d 100644 --- a/tools/acpiexec/aecommon.h +++ b/tools/acpiexec/aecommon.h @@ -125,14 +125,14 @@ #include <string.h> #include <signal.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acparser.h> -#include <contrib/dev/acpica/amlcode.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> -#include <contrib/dev/acpica/actables.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acapps.h> +#include "acpi.h" +#include "acparser.h" +#include "amlcode.h" +#include "acnamesp.h" +#include "acdebug.h" +#include "actables.h" +#include "acinterp.h" +#include "acapps.h" extern FILE *AcpiGbl_DebugFile; extern BOOLEAN AcpiGbl_IgnoreErrors; diff --git a/utilities/utalloc.c b/utilities/utalloc.c index d1528e330411..7339e77dd43c 100644 --- a/utilities/utalloc.c +++ b/utilities/utalloc.c @@ -116,8 +116,8 @@ #define __UTALLOC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acdebug.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utalloc") diff --git a/utilities/utcache.c b/utilities/utcache.c index 56e88b3d1a32..5bd83011bd10 100644 --- a/utilities/utcache.c +++ b/utilities/utcache.c @@ -116,7 +116,7 @@ #define __UTCACHE_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utcache") diff --git a/utilities/utclib.c b/utilities/utclib.c index 77e0d0e7a545..151e03a1cca5 100644 --- a/utilities/utclib.c +++ b/utilities/utclib.c @@ -117,7 +117,7 @@ #define __CMCLIB_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" /* * These implementations of standard C Library routines can optionally be diff --git a/utilities/utcopy.c b/utilities/utcopy.c index 2d4072c12cfb..f7847dc38d6d 100644 --- a/utilities/utcopy.c +++ b/utilities/utcopy.c @@ -116,8 +116,8 @@ #define __UTCOPY_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "amlcode.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utdebug.c b/utilities/utdebug.c index 59b91d7f1fc2..bcfec9d69edb 100644 --- a/utilities/utdebug.c +++ b/utilities/utdebug.c @@ -116,7 +116,7 @@ #define __UTDEBUG_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utdebug") diff --git a/utilities/utdelete.c b/utilities/utdelete.c index e78796edbb80..7a848a29cf02 100644 --- a/utilities/utdelete.c +++ b/utilities/utdelete.c @@ -116,11 +116,11 @@ #define __UTDELETE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acinterp.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acinterp.h" +#include "acnamesp.h" +#include "acevents.h" +#include "amlcode.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utdelete") diff --git a/utilities/uteval.c b/utilities/uteval.c index 5e16abb1f11e..95b88b479a93 100644 --- a/utilities/uteval.c +++ b/utilities/uteval.c @@ -116,9 +116,9 @@ #define __UTEVAL_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acinterp.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acinterp.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utglobal.c b/utilities/utglobal.c index b83d288c468a..ff84c3f878eb 100644 --- a/utilities/utglobal.c +++ b/utilities/utglobal.c @@ -117,8 +117,8 @@ #define __UTGLOBAL_C__ #define DEFINE_ACPI_GLOBALS -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" ACPI_EXPORT_SYMBOL (AcpiGbl_FADT) diff --git a/utilities/utinit.c b/utilities/utinit.c index b16d5423eba8..f13e4232995a 100644 --- a/utilities/utinit.c +++ b/utilities/utinit.c @@ -117,10 +117,10 @@ #define __UTINIT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/actables.h> +#include "acpi.h" +#include "acnamesp.h" +#include "acevents.h" +#include "actables.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utinit") diff --git a/utilities/utmath.c b/utilities/utmath.c index f6dad738abc1..9417e5eca4ed 100644 --- a/utilities/utmath.c +++ b/utilities/utmath.c @@ -117,7 +117,7 @@ #define __UTMATH_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utmisc.c b/utilities/utmisc.c index f1585da587e4..a3cdeb8b067c 100644 --- a/utilities/utmisc.c +++ b/utilities/utmisc.c @@ -117,8 +117,8 @@ #define __UTMISC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include "acpi.h" +#include "acnamesp.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utmutex.c b/utilities/utmutex.c index 701d26951d1c..8c86a33f9c51 100644 --- a/utilities/utmutex.c +++ b/utilities/utmutex.c @@ -117,7 +117,7 @@ #define __UTMUTEX_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utmutex") diff --git a/utilities/utobject.c b/utilities/utobject.c index 5b0c3f320044..fe5c2c34159b 100644 --- a/utilities/utobject.c +++ b/utilities/utobject.c @@ -116,9 +116,9 @@ #define __UTOBJECT_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/amlcode.h> +#include "acpi.h" +#include "acnamesp.h" +#include "amlcode.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utresrc.c b/utilities/utresrc.c index 530f782ae713..67d01f4de4b9 100644 --- a/utilities/utresrc.c +++ b/utilities/utresrc.c @@ -117,8 +117,8 @@ #define __UTRESRC_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/amlresrc.h> +#include "acpi.h" +#include "amlresrc.h" #define _COMPONENT ACPI_UTILITIES diff --git a/utilities/utstate.c b/utilities/utstate.c index a58257bc0bd7..79013544f44c 100644 --- a/utilities/utstate.c +++ b/utilities/utstate.c @@ -117,7 +117,7 @@ #define __UTSTATE_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utstate") diff --git a/utilities/uttrack.c b/utilities/uttrack.c index 5c2ae9380403..d9f2d0e7a3ee 100644 --- a/utilities/uttrack.c +++ b/utilities/uttrack.c @@ -127,7 +127,7 @@ #define __UTTRACK_C__ -#include <contrib/dev/acpica/acpi.h> +#include "acpi.h" #ifdef ACPI_DBG_TRACK_ALLOCATIONS diff --git a/utilities/utxface.c b/utilities/utxface.c index 83c420ea9649..1dce4b42c61a 100644 --- a/utilities/utxface.c +++ b/utilities/utxface.c @@ -117,10 +117,10 @@ #define __UTXFACE_C__ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acevents.h> -#include <contrib/dev/acpica/acnamesp.h> -#include <contrib/dev/acpica/acdebug.h> +#include "acpi.h" +#include "acevents.h" +#include "acnamesp.h" +#include "acdebug.h" #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utxface") |