From: Sascha Wildner <saw@online.de>
Date: Tue, 20 May 2014 17:57:49 +0000 (+0200)
Subject: acpica: Use only one #ifdef _KERNEL ... and use 'inline' directly.
X-Git-Tag: v3.9.0~18
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d52c888512ee8471d27c7ec8f9ec4603194a55be

acpica: Use only one #ifdef _KERNEL ... and use 'inline' directly.
---

diff --git a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h
index 20531cfd15..6d43539b69 100644
--- a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h
+++ b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h
@@ -122,15 +122,11 @@
 #include <machine/acpica_machdep.h>
 
 #define ACPI_UINTPTR_T		uintptr_t
-
-#ifdef _KERNEL
-#include "opt_acpi.h"
-#endif
-
 #define ACPI_USE_DO_WHILE_0
 
 #ifdef _KERNEL
 
+#include "opt_acpi.h"
 #include <sys/ctype.h>
 #include <sys/systm.h>
 #include <stdarg.h>
@@ -200,6 +196,4 @@ struct acpicache;
 
 #endif /* _KERNEL */
 
-#define inline		__inline
-
 #endif /* __ACDRAGONFLY_H_ */