From 8a7e9ab4b72a1ca706d041ea655e5d30fa420e18 Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Tue, 15 Jul 2003 19:18:41 +0000 Subject: [PATCH] Fix the ACPI_DEBUG build for the non-module case. Move the #define into acfreebsd.h and remove it from the Makefile. Now ACPI_DEBUG implies ACPI_DISASSEMBLER. Noticed by: marcel --- sys/contrib/dev/acpica/acfreebsd.h | 1 + sys/modules/acpi/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/dev/acpica/acfreebsd.h b/sys/contrib/dev/acpica/acfreebsd.h index 133b128b469..53abc150e20 100644 --- a/sys/contrib/dev/acpica/acfreebsd.h +++ b/sys/contrib/dev/acpica/acfreebsd.h @@ -134,6 +134,7 @@ #ifdef ACPI_DEBUG #define ACPI_DEBUG_OUTPUT /* for backward compatibility */ +#define ACPI_DISASSEMBLER #endif #ifdef _KERNEL diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index 37542536263..50af6418512 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -53,7 +53,7 @@ CFLAGS+=-DACPI_MAX_THREADS=${ACPI_MAX_THREADS} # Debugging support .if ACPI_DEBUG -CFLAGS+=-DACPI_DEBUG -DACPI_DISASSEMBLER +CFLAGS+=-DACPI_DEBUG SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c SRCS+= dbinput.c dbstats.c dbutils.c dbxface.c SRCS+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c