Module Name: src
Committed By: jmcneill
Date: Sat Oct 17 14:54:10 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
Log Message:
Don't include ACPI headers unless NACPICA > 0
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/include/linux/pci.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/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.19 src/sys/external/bsd/drm2/include/linux/pci.h:1.20
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.19 Wed Jun 24 19:46:30 2015
+++ src/sys/external/bsd/drm2/include/linux/pci.h Sat Oct 17 14:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.19 2015/06/24 19:46:30 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.20 2015/10/17 14:54:10 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -54,8 +54,12 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/agpvar.h>
+#if NACPICA > 0
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_pci.h>
+#else
+struct acpi_devnode;
+#endif
#include <linux/dma-mapping.h>
#include <linux/ioport.h>
