[src/trunk]: src/sys/external/bsd/drm2/include/linux drm: Omit needless condi...

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

details:   https://anonhg.NetBSD.org/src/rev/23b8dc329614
branches:  trunk
changeset: 362439:23b8dc329614
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 27 14:22:29 2022 +0000

description:
drm: Omit needless conditionals around #include "acpica.h".

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  4 +---
 sys/external/bsd/drm2/include/linux/acpi.h     |  6 +-----
 sys/external/bsd/drm2/include/linux/pci.h      |  6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r 1a23ee7262fb -r 23b8dc329614 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Feb 27 14:22:21 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Feb 27 14:22:29 2022 +0000
@@ -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
diff -r 1a23ee7262fb -r 23b8dc329614 sys/external/bsd/drm2/include/linux/acpi.h
--- a/sys/external/bsd/drm2/include/linux/acpi.h        Sun Feb 27 14:22:21 2022 +0000
+++ b/sys/external/bsd/drm2/include/linux/acpi.h        Sun Feb 27 14:22:29 2022 +0000
@@ -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
diff -r 1a23ee7262fb -r 23b8dc329614 sys/external/bsd/drm2/include/linux/pci.h
--- a/sys/external/bsd/drm2/include/linux/pci.h Sun Feb 27 14:22:21 2022 +0000
+++ b/sys/external/bsd/drm2/include/linux/pci.h Sun Feb 27 14:22:29 2022 +0000
@@ -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>