diff options
author | jkim <jkim@FreeBSD.org> | 2009-06-05 18:44:36 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2009-06-05 18:44:36 +0000 |
commit | 6d358bddff8eb82625370b62ff77b8fc34b088c6 (patch) | |
tree | d775a86a0ebbf412e4960fa787e9a405073ca489 /sys/boot | |
parent | 40089f58a4f91db8bce335b75fbf69551f76b60e (diff) | |
download | FreeBSD-src-6d358bddff8eb82625370b62ff77b8fc34b088c6.zip FreeBSD-src-6d358bddff8eb82625370b62ff77b8fc34b088c6.tar.gz |
Import ACPICA 20090521.
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/i386/libi386/Makefile | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/biosacpi.c | 2 | ||||
-rw-r--r-- | sys/boot/ia64/ski/acpi_stub.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 9a2a3fa..c1bbb52 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -48,7 +48,7 @@ CFLAGS+= -DTERM_EMU CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c index 971e7c7..0815983 100644 --- a/sys/boot/i386/libi386/biosacpi.c +++ b/sys/boot/i386/libi386/biosacpi.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <btxv86.h> #include "libi386.h" -#include "acfreebsd.h" +#include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" diff --git a/sys/boot/ia64/ski/acpi_stub.c b/sys/boot/ia64/ski/acpi_stub.c index 8e08e52..b16bb0a 100644 --- a/sys/boot/ia64/ski/acpi_stub.c +++ b/sys/boot/ia64/ski/acpi_stub.c @@ -27,7 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC 7 |