diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-02-05 22:13:57 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-02-05 22:17:02 +0000 |
| commit | a841e5470385fa62fa65d6de5bcba33afdbf42ea (patch) | |
| tree | 9632d72fbe929b3260b9906e4ad7957a8f96dc9f | |
| parent | 6d4a140acfdf637bb559d371c583e4db478e1549 (diff) | |
| parent | ef3ba9d625927fd4592a8c071698a562821485bd (diff) | |
| download | src-a841e5470385fa62fa65d6de5bcba33afdbf42ea.tar.gz src-a841e5470385fa62fa65d6de5bcba33afdbf42ea.zip | |
acpica: Create merge commit against vendor branch
Merge tracking branch 'vendor/acpica' for vendor/acpica/20230628, and
resolve conflicts.
This deletes files that we've deleted since the last merge (during SVN
times it seems) so future merges don't bring them up.
It resolves conflicts in several files that we have modified (but we can
likely fix the build system so we don't have to modify them since it's
almost all headers) and one ifndef kernel that could be solved with an
empty #define.
It also deletes new files in the platform directory that are similar to
prior non-freebsd platform files we've deleted.
The net delta: +1 line.
Sponsored by: Netflix
| -rw-r--r-- | sys/contrib/dev/acpica/components/debugger/dbcmds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c index 4c8f091f126c..74263a01dc9f 100644 --- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c +++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c @@ -156,6 +156,7 @@ #include <contrib/dev/acpica/include/acnamesp.h> #include <contrib/dev/acpica/include/acresrc.h> #include <contrib/dev/acpica/include/actables.h> +#include "limits.h" #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds") |