From 3ffcacc9d89b85027b07e20401b447edb5c37284 Mon Sep 17 00:00:00 2001
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Sun, 1 Oct 2000 08:17:47 +0000
Subject: Remove ACPI_NO_OSDFUNC_INLINE option from kernel configuration.  Now
 that it's enabled in acpireg.h only if DIAGNOSTIC option is specified. ACPICA
 OSD functions will be compiled in machine/acpi_machdep.c again tentatively
 (if DIAGNOSTIC option is specified). # Should we have acpica_osd.c ?

---
 sys/dev/acpi/acpireg.h        | 3 +++
 sys/dev/acpi/aml/aml_common.c | 3 +++
 sys/dev/acpi/aml/aml_region.c | 2 ++
 3 files changed, 8 insertions(+)

(limited to 'sys/dev')

diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h
index 1d64e92314ab..409afe6897aa 100644
--- a/sys/dev/acpi/acpireg.h
+++ b/sys/dev/acpi/acpireg.h
@@ -310,6 +310,9 @@ typedef UINT32				ACPI_STATUS;
 /*
  * ACPICA Osd family functions
  */
+#if defined(DIAGNOSTIC)
+#define ACPI_NO_OSDFUNC_INLINE
+#endif
 
 #ifdef ACPI_NO_OSDFUNC_INLINE
 ACPI_STATUS	 OsdMapMemory(void *, UINT32, void **);
diff --git a/sys/dev/acpi/aml/aml_common.c b/sys/dev/acpi/aml/aml_common.c
index a00f971ca34a..da616a6e7aa2 100644
--- a/sys/dev/acpi/aml/aml_common.c
+++ b/sys/dev/acpi/aml/aml_common.c
@@ -42,7 +42,10 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <machine/bus.h>
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #ifndef ACPI_NO_OSDFUNC_INLINE
 #include <machine/acpica_osd.h>
 #endif /* !ACPI_NO_OSDFUNC_INLINE */
diff --git a/sys/dev/acpi/aml/aml_region.c b/sys/dev/acpi/aml/aml_region.c
index a96b2b6fc2ec..e643b662c802 100644
--- a/sys/dev/acpi/aml/aml_region.c
+++ b/sys/dev/acpi/aml/aml_region.c
@@ -35,12 +35,14 @@
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #include <dev/acpi/aml/aml_common.h>
 #include <dev/acpi/aml/aml_region.h>
 #include <dev/acpi/aml/aml_name.h>
-- 
cgit v1.3