git: f1e8d3361b94 - main - acpica: Fix my mismerge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Feb 2024 05:50:56 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=f1e8d3361b944a46f514c7d44330a5f2c0b62a1c
commit f1e8d3361b944a46f514c7d44330a5f2c0b62a1c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-07 05:47:42 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-07 05:47:42 +0000
acpica: Fix my mismerge
I merged in the limits.h include. I should have resolved this by
deleting it (since we have no easy way to 'fix' it with compat headers).
GENERIC doesn't bring in the debugger, but LINT does...
Sponsored by: Netflix
---
sys/contrib/dev/acpica/components/debugger/dbcmds.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c
index 74263a01dc9f..4c8f091f126c 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c
@@ -156,7 +156,6 @@
#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")