From 49699acf1436ae1c6d3ba92f6e77ef7d81fad350 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 7 Jul 2014 11:08:48 +0200 Subject: [PATCH] acpica: Clean up the config header a bit. --- .../dev/acpica/source/include/platform/acdragonfly.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h index 6d43539b69..1ea8793370 100644 --- a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h +++ b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h @@ -139,15 +139,12 @@ #ifdef ACPI_DEBUG #define ACPI_DEBUG_OUTPUT /* for backward compatibility */ -#define ACPI_DISASSEMBLER -#endif - -#ifdef ACPI_DEBUG_OUTPUT #include "opt_ddb.h" #ifdef DDB #define ACPI_DEBUGGER #endif /* DDB */ -#endif /* ACPI_DEBUG_OUTPUT */ +#define ACPI_DISASSEMBLER +#endif #ifdef ACPI_DEBUG_CACHE #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReleaseObject @@ -186,12 +183,10 @@ struct acpicache; #else /* _KERNEL */ /* Always use DragonFly code over our local versions */ +#define ACPI_USE_STANDARD_HEADERS #define ACPI_USE_SYSTEM_CLIBRARY #define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) ACPI_TO_INTEGER (pthread)) - -/* Not building kernel code, so use libc */ -#define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() #endif /* _KERNEL */ -- 2.41.0