From 6d358bddff8eb82625370b62ff77b8fc34b088c6 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Fri, 5 Jun 2009 18:44:36 +0000
Subject: Import ACPICA 20090521.

---
 sys/amd64/acpica/OsdEnvironment.c | 6 +++---
 sys/amd64/acpica/acpi_machdep.c   | 3 ++-
 sys/amd64/acpica/acpi_wakeup.c    | 3 ++-
 sys/amd64/acpica/madt.c           | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'sys/amd64/acpica')

diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index 6928f21..fb01a3f 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker_set.h>
 #include <sys/sysctl.h>
 
-#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>
 
 static u_long amd64_acpi_root;
 
@@ -63,7 +63,7 @@ AcpiOsGetRootPointer(void)
 
 	if (amd64_acpi_root == 0 &&
 	    (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 ||
-	    AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) &&
+	    AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) &&
 	    ptr != 0)
 		amd64_acpi_root = ptr;
 
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index c69f14a..b902c12 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -33,7 +33,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #include <machine/nexusvar.h>
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 2f9d8a0..bcc405f 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -53,7 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #endif
 
-#include <contrib/dev/acpica/acpi.h>
+#include <contrib/dev/acpica/include/acpi.h>
+
 #include <dev/acpica/acpivar.h>
 
 #include "acpi_wakecode.h"
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c
index a8df55d..b27f8e4 100644
--- a/sys/amd64/acpica/madt.c
+++ b/sys/amd64/acpica/madt.c
@@ -48,8 +48,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-#include <contrib/dev/acpica/acpi.h>
-#include <contrib/dev/acpica/actables.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/actables.h>
+
 #include <dev/acpica/acpivar.h>
 #include <dev/pci/pcivar.h>
 
-- 
cgit v1.1