Module Name: src Committed By: riastradh Date: Sun Feb 27 14:22:30 UTC 2022
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h src/sys/external/bsd/drm2/include/linux: acpi.h pci.h Log Message: drm: Omit needless conditionals around #include "acpica.h". To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/acpi.h cvs rdiff -u -r1.51 -r1.52 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/dist/drm/i915/i915_drv.h diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.46 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.47 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.46 Sun Dec 19 11:55:24 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Feb 27 14:22:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_drv.h,v 1.46 2021/12/19 11:55:24 riastradh Exp $ */ +/* $NetBSD: i915_drv.h,v 1.47 2022/02/27 14:22:29 riastradh Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ @@ -34,9 +34,7 @@ #if defined(__NetBSD__) #ifdef _KERNEL_OPT -#if defined(i386) || defined(amd64) #include "acpica.h" -#endif /* i386 || amd64 */ #endif /* _KERNEL_OPT */ #if (NACPICA > 0) #define CONFIG_ACPI Index: src/sys/external/bsd/drm2/include/linux/acpi.h diff -u src/sys/external/bsd/drm2/include/linux/acpi.h:1.7 src/sys/external/bsd/drm2/include/linux/acpi.h:1.8 --- src/sys/external/bsd/drm2/include/linux/acpi.h:1.7 Sun Feb 27 14:22:21 2022 +++ src/sys/external/bsd/drm2/include/linux/acpi.h Sun Feb 27 14:22:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.h,v 1.7 2022/02/27 14:22:21 riastradh Exp $ */ +/* $NetBSD: acpi.h,v 1.8 2022/02/27 14:22:29 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -33,11 +33,7 @@ #define _LINUX_ACPI_H_ #ifdef _KERNEL_OPT -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) #include "acpica.h" -#else -#define NACPICA 0 -#endif #endif #if NACPICA > 0 Index: src/sys/external/bsd/drm2/include/linux/pci.h diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.51 src/sys/external/bsd/drm2/include/linux/pci.h:1.52 --- src/sys/external/bsd/drm2/include/linux/pci.h:1.51 Sun Dec 19 12:13:16 2021 +++ src/sys/external/bsd/drm2/include/linux/pci.h Sun Feb 27 14:22:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.h,v 1.51 2021/12/19 12:13:16 riastradh Exp $ */ +/* $NetBSD: pci.h,v 1.52 2022/02/27 14:22:29 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -33,11 +33,7 @@ #define _LINUX_PCI_H_ #ifdef _KERNEL_OPT -#if defined(i386) || defined(amd64) || defined(__aarch64__) #include "acpica.h" -#else /* !(i386 || amd64) */ -#define NACPICA 0 -#endif /* i386 || amd64 */ #endif #include <sys/types.h>