diff options
| -rw-r--r-- | sys/conf/NOTES | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/aml/aml_common.c | 3 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 8 | ||||
| -rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_common.c | 3 |
4 files changed, 14 insertions, 8 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3555733..c2b94ab 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1239,10 +1239,10 @@ hint.npx.0.irq="13" # ACPI Experimental Driver device acpi -options ACPI_DEBUG -options AML_DEBUG -options ACPI_NO_ENABLE_ON_BOOT -options ACPI_NO_OSDFUNC_INLINE +options ACPI_DEBUG +options AML_DEBUG +options ACPI_NO_ENABLE_ON_BOOT +options ACPI_NO_OSDFUNC_INLINE # # Optional devices: diff --git a/sys/dev/acpi/aml/aml_common.c b/sys/dev/acpi/aml/aml_common.c index fe98e1e..4721b7f 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/acpi.h> +#ifndef ACPI_NO_OSDFUNC_INLINE #include <machine/acpica_osd.h> +#endif /* !ACPI_NO_OSDFUNC_INLINE */ #endif /* !_KERNEL */ #include <dev/acpi/aml/aml_common.h> diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 3555733..c2b94ab 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1239,10 +1239,10 @@ hint.npx.0.irq="13" # ACPI Experimental Driver device acpi -options ACPI_DEBUG -options AML_DEBUG -options ACPI_NO_ENABLE_ON_BOOT -options ACPI_NO_OSDFUNC_INLINE +options ACPI_DEBUG +options AML_DEBUG +options ACPI_NO_ENABLE_ON_BOOT +options ACPI_NO_OSDFUNC_INLINE # # Optional devices: diff --git a/usr.sbin/acpi/amldb/aml/aml_common.c b/usr.sbin/acpi/amldb/aml/aml_common.c index fe98e1e..4721b7f 100644 --- a/usr.sbin/acpi/amldb/aml/aml_common.c +++ b/usr.sbin/acpi/amldb/aml/aml_common.c @@ -42,7 +42,10 @@ #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/systm.h> +#include <sys/acpi.h> +#ifndef ACPI_NO_OSDFUNC_INLINE #include <machine/acpica_osd.h> +#endif /* !ACPI_NO_OSDFUNC_INLINE */ #endif /* !_KERNEL */ #include <dev/acpi/aml/aml_common.h> |
