Module Name: src
Committed By: jmcneill
Date: Sat Oct 17 21:07:23 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: acpi.h
Log Message:
only include acpivar.h when NACPICA > 0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/acpi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/acpi.h
diff -u src/sys/external/bsd/drm2/include/linux/acpi.h:1.3 src/sys/external/bsd/drm2/include/linux/acpi.h:1.4
--- src/sys/external/bsd/drm2/include/linux/acpi.h:1.3 Wed Nov 5 23:46:09 2014
+++ src/sys/external/bsd/drm2/include/linux/acpi.h Sat Oct 17 21:07:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.h,v 1.3 2014/11/05 23:46:09 nonaka Exp $ */
+/* $NetBSD: acpi.h,v 1.4 2015/10/17 21:07:23 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,6 +32,16 @@
#ifndef _LINUX_ACPI_H_
#define _LINUX_ACPI_H_
+#ifdef _KERNEL_OPT
+#if defined(__i386__) || defined(__x86_64__)
+#include "acpica.h"
+#else
+#define NACPICA 0
+#endif
+#endif
+
+#if NACPICA > 0
#include <dev/acpi/acpivar.h>
+#endif
#endif /* _LINUX_ACPI_H_ */
