[src/thorpej-i2c-spi-conf]: src/sys/dev/i2c Revert most of previous -- some c...

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

details:   https://anonhg.NetBSD.org/src/rev/18f86175fb45
branches:  thorpej-i2c-spi-conf
changeset: 378765:18f86175fb45
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun May 09 23:19:10 2021 +0000

description:
Revert most of previous -- some consumers of this file still have
ACPI-specific requirements.

diffstat:

 sys/dev/i2c/i2cmuxvar.h |  23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r c4dc84ee581b -r 18f86175fb45 sys/dev/i2c/i2cmuxvar.h
--- a/sys/dev/i2c/i2cmuxvar.h   Sun May 09 22:36:35 2021 +0000
+++ b/sys/dev/i2c/i2cmuxvar.h   Sun May 09 23:19:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i2cmuxvar.h,v 1.3.4.2 2021/05/08 15:10:44 thorpej Exp $        */
+/*     $NetBSD: i2cmuxvar.h,v 1.3.4.3 2021/05/09 23:19:10 thorpej Exp $        */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -36,6 +36,23 @@
 
 /* XXX This is not ideal, but... XXX */
 
+#if defined(__i386__) || defined(__amd64__) || defined(__aarch64__)
+
+#ifdef _KERNEL_OPT
+#include "acpica.h"
+
+#if NACPICA > 0
+#define        I2CMUX_USE_ACPI
+#endif
+
+#else /* ! _KERNEL_OPT */
+
+#define        I2CMUX_USE_ACPI
+
+#endif /* _KERNEL_OPT */
+
+#endif /* __i386__ || __amd64__ || __aarch64__ */
+
 #if defined(__arm__) || defined(__aarch64__)
 
 #ifdef _KERNEL_OPT
@@ -55,6 +72,10 @@
 
 /* XXX ^^^ XXX */
 
+#if defined(I2CMUX_USE_ACPI)
+#include <dev/acpi/acpivar.h>
+#endif
+
 #if defined(I2CMUX_USE_FDT)
 #include <dev/fdt/fdtvar.h>
 #endif