Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/include/linux Don't include ACPI heade...



details:   https://anonhg.NetBSD.org/src/rev/dda46aee8ccd
branches:  trunk
changeset: 341063:dda46aee8ccd
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 17 14:54:10 2015 +0000

description:
Don't include ACPI headers unless NACPICA > 0

diffstat:

 sys/external/bsd/drm2/include/linux/pci.h |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r d3f859862da5 -r dda46aee8ccd sys/external/bsd/drm2/include/linux/pci.h
--- a/sys/external/bsd/drm2/include/linux/pci.h Sat Oct 17 14:46:01 2015 +0000
+++ b/sys/external/bsd/drm2/include/linux/pci.h Sat Oct 17 14:54:10 2015 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index