summaryrefslogtreecommitdiffstats
path: root/sys/ia64
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2009-06-05 18:44:36 +0000
committerjkim <jkim@FreeBSD.org>2009-06-05 18:44:36 +0000
commit6d358bddff8eb82625370b62ff77b8fc34b088c6 (patch)
treed775a86a0ebbf412e4960fa787e9a405073ca489 /sys/ia64
parent40089f58a4f91db8bce335b75fbf69551f76b60e (diff)
downloadFreeBSD-src-6d358bddff8eb82625370b62ff77b8fc34b088c6.zip
FreeBSD-src-6d358bddff8eb82625370b62ff77b8fc34b088c6.tar.gz
Import ACPICA 20090521.
Diffstat (limited to 'sys/ia64')
-rw-r--r--sys/ia64/acpica/OsdEnvironment.c2
-rw-r--r--sys/ia64/acpica/acpi_machdep.c3
-rw-r--r--sys/ia64/acpica/acpi_wakeup.c3
-rw-r--r--sys/ia64/acpica/madt.c4
-rw-r--r--sys/ia64/ia64/nexus.c3
5 files changed, 9 insertions, 6 deletions
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index 9345eff..209e343 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <machine/efi.h>
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
static struct uuid acpi_root_uuid = EFI_TABLE_ACPI20;
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
index 9426dd0..e5623fb 100644
--- a/sys/ia64/acpica/acpi_machdep.c
+++ b/sys/ia64/acpica/acpi_machdep.c
@@ -29,7 +29,8 @@
#include <sys/param.h>
#include <sys/bus.h>
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
#include <dev/acpica/acpivar.h>
#include <machine/pal.h>
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
index 3003a57f..c81c3b3 100644
--- a/sys/ia64/acpica/acpi_wakeup.c
+++ b/sys/ia64/acpica/acpi_wakeup.c
@@ -29,7 +29,8 @@
#include <sys/param.h>
#include <sys/bus.h>
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
#include <dev/acpica/acpivar.h>
int
diff --git a/sys/ia64/acpica/madt.c b/sys/ia64/acpica/madt.c
index 50b53b8..2543088 100644
--- a/sys/ia64/acpica/madt.c
+++ b/sys/ia64/acpica/madt.c
@@ -26,8 +26,8 @@
* $FreeBSD$
*/
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/actables.h>
#include <machine/md_var.h>
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index a069399..502dc72 100644
--- a/sys/ia64/ia64/nexus.c
+++ b/sys/ia64/ia64/nexus.c
@@ -62,7 +62,8 @@
#include <machine/sapicvar.h>
#include <machine/vmparam.h>
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
#include <dev/acpica/acpivar.h>
#include <isa/isareg.h>
OpenPOWER on IntegriCloud