[src/trunk]: src/sys/external/bsd/drm2/linux Move acpi includes to linux_pci....

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/77ae36fa9f54
branches:  trunk
changeset: 1028401:77ae36fa9f54
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:57:42 2021 +0000

description:
Move acpi includes to linux_pci.c to avoid pollution.

diffstat:

 sys/external/bsd/drm2/include/linux/pci.h |  10 ++--------
 sys/external/bsd/drm2/linux/linux_pci.c   |   9 +++++++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r d21169d01095 -r 77ae36fa9f54 sys/external/bsd/drm2/include/linux/pci.h
--- a/sys/external/bsd/drm2/include/linux/pci.h Sun Dec 19 10:57:34 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/pci.h Sun Dec 19 10:57:42 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci.h,v 1.46 2021/12/19 09:55:32 riastradh Exp $       */
+/*     $NetBSD: pci.h,v 1.47 2021/12/19 10:57:42 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -54,13 +54,6 @@
 #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/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
@@ -69,6 +62,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 
+struct acpi_devnode;
 struct pci_driver;
 
 struct pci_bus {
diff -r d21169d01095 -r 77ae36fa9f54 sys/external/bsd/drm2/linux/linux_pci.c
--- a/sys/external/bsd/drm2/linux/linux_pci.c   Sun Dec 19 10:57:34 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_pci.c   Sun Dec 19 10:57:42 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_pci.c,v 1.15 2021/12/19 09:49:39 riastradh Exp $ */
+/*     $NetBSD: linux_pci.c,v 1.16 2021/12/19 10:57:42 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,12 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.15 2021/12/19 09:49:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.16 2021/12/19 10:57:42 riastradh Exp $");
+
+#if NACPICA > 0
+#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_pci.h>
+#endif
 
 #include <linux/pci.h>