From 0c630021f5877d66e2c5d4a999bd9a719a7112ec Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Sun, 11 Aug 2013 18:29:00 +0200
Subject: [PATCH] acpica: Replace some include paths by full ones

To allow the ACPI header files to be used in the whole kernel
---
 sys/contrib/dev/acpica-unix/include/platform/acenv.h |  2 +-
 sys/dev/acpica/acdragonfly.h                         |  2 +-
 sys/dev/acpica/acpivar.h                             | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/contrib/dev/acpica-unix/include/platform/acenv.h b/sys/contrib/dev/acpica-unix/include/platform/acenv.h
index 31a2bbb575..6ef3f56ac8 100644
--- a/sys/contrib/dev/acpica-unix/include/platform/acenv.h
+++ b/sys/contrib/dev/acpica-unix/include/platform/acenv.h
@@ -203,7 +203,7 @@
 #include "acfreebsd.h"
 
 #elif defined(__DragonFly__)
-#include "acdragonfly.h"
+#include <dev/acpica/acdragonfly.h>
 
 #elif defined(__NetBSD__)
 #include "acnetbsd.h"
diff --git a/sys/dev/acpica/acdragonfly.h b/sys/dev/acpica/acdragonfly.h
index 13cddaa448..fc41225f70 100644
--- a/sys/dev/acpica/acdragonfly.h
+++ b/sys/dev/acpica/acdragonfly.h
@@ -119,8 +119,8 @@
 
 /* DragonFly uses GCC */
 
-#include <platform/acgcc.h>
 #include <sys/types.h>
+#include <contrib/dev/acpica-unix/include/platform/acgcc.h>
 #include <machine/acpica_machdep.h>
 
 #define ACPI_UINTPTR_T		uintptr_t
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index dfefac114c..eb870a54d0 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -43,12 +43,12 @@
 #include <sys/spinlock.h>
 #include <sys/spinlock2.h>
 #include <sys/serialize.h>
-#include "acmacros.h"
-#include "acconfig.h"
-#include "aclocal.h"
-#include "acobject.h"
-#include "acstruct.h"
-#include "acutils.h"
+#include <contrib/dev/acpica-unix/include/acmacros.h>
+#include <contrib/dev/acpica-unix/include/acconfig.h>
+#include <contrib/dev/acpica-unix/include/aclocal.h>
+#include <contrib/dev/acpica-unix/include/acobject.h>
+#include <contrib/dev/acpica-unix/include/acstruct.h>
+#include <contrib/dev/acpica-unix/include/acutils.h>
 
 struct apm_clone_data;
 struct acpi_softc {
-- 
2.41.0