Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:57:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
src/sys/external/bsd/drm2/linux: linux_pci.c
Log Message:
Move acpi includes to linux_pci.c to avoid pollution.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/linux/linux_pci.c
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.46 src/sys/external/bsd/drm2/include/linux/pci.h:1.47
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.46 Sun Dec 19 09:55:32 2021
+++ src/sys/external/bsd/drm2/include/linux/pci.h Sun Dec 19 10:57:42 2021
@@ -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 @@ struct acpi_devnode;
#include <linux/ioport.h>
#include <linux/kernel.h>
+struct acpi_devnode;
struct pci_driver;
struct pci_bus {
Index: src/sys/external/bsd/drm2/linux/linux_pci.c
diff -u src/sys/external/bsd/drm2/linux/linux_pci.c:1.15 src/sys/external/bsd/drm2/linux/linux_pci.c:1.16
--- src/sys/external/bsd/drm2/linux/linux_pci.c:1.15 Sun Dec 19 09:49:39 2021
+++ src/sys/external/bsd/drm2/linux/linux_pci.c Sun Dec 19 10:57:42 2021
@@ -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>
