From 4bccc7175f625f4bc1f2733612ce09e7493bd3e2 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Tue, 29 May 2001 20:03:32 +0000
Subject: [PATCH]  - wbinvd isn't an inline on ia64.  - includes are not in
 subdirectories.

---
 sys/contrib/dev/acpica/acgcc.h    | 2 --
 sys/contrib/dev/acpica/acpi.h     | 2 +-
 sys/contrib/dev/acpica/acpiosxf.h | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h
index 435277de318..ce7fac5c250 100644
--- a/sys/contrib/dev/acpica/acgcc.h
+++ b/sys/contrib/dev/acpica/acgcc.h
@@ -130,9 +130,7 @@
 #define BREAKPOINT3
 #define disable() __cli()
 #define enable()  __sti()
-#ifndef __FreeBSD__	/* XXX conflicts with inline in cpufunc.h */
 #define wbinvd()
-#endif
 
 /*! [Begin] no source code translation */
 
diff --git a/sys/contrib/dev/acpica/acpi.h b/sys/contrib/dev/acpica/acpi.h
index fca0cb43758..bdbb2012ca4 100644
--- a/sys/contrib/dev/acpica/acpi.h
+++ b/sys/contrib/dev/acpica/acpi.h
@@ -123,7 +123,7 @@
  * in the rest of the source code again and again.
  */
 #include "acconfig.h"           /* Configuration constants */
-#include "platform/acenv.h"     /* Target environment specific items */
+#include "acenv.h"              /* Target environment specific items */
 #include "actypes.h"            /* Fundamental common data types */
 #include "acexcep.h"            /* ACPI exception codes */
 #include "acmacros.h"           /* C macros */
diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/sys/contrib/dev/acpica/acpiosxf.h
index a8939705de3..b84c442bae0 100644
--- a/sys/contrib/dev/acpica/acpiosxf.h
+++ b/sys/contrib/dev/acpica/acpiosxf.h
@@ -120,7 +120,7 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
+#include "acenv.h"
 #include "actypes.h"