move simplebusvar.h so it can be used without ifdef

ok kettenis@ phessler@

6 files changed, 13 insertions, 11 deletions

diff --git a/sys/arch/armv7/exynos/exdwusb.c b/sys/arch/armv7/exynos/exdwusb.c
index b6100255525..b21ea762e8c 100644
--- a/sys/arch/armv7/exynos/exdwusb.c
+++ b/sys/arch/armv7/exynos/exdwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exdwusb.c,v 1.5 2021/10/24 17:52:27 mpi Exp $	*/
+/*	$OpenBSD: exdwusb.c,v 1.6 2023/09/22 01:10:43 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -19,8 +19,7 @@
 #include <sys/device.h>
 
 #include <machine/fdt.h>
-
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/armv7/exynos/expower.c b/sys/arch/armv7/exynos/expower.c
index 50a91c84cb7..0b0a64a8f89 100644
--- a/sys/arch/armv7/exynos/expower.c
+++ b/sys/arch/armv7/exynos/expower.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expower.c,v 1.10 2021/10/24 17:52:27 mpi Exp $ */
+/* $OpenBSD: expower.c,v 1.11 2023/09/22 01:10:43 jsg Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -26,7 +26,7 @@
 #include <dev/ofw/ofw_misc.h>
 #include <dev/ofw/fdt.h>
 
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #define HREAD4(sc, reg)							\
 	(bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg)))
diff --git a/sys/arch/armv7/include/simplebusvar.h b/sys/arch/armv7/include/simplebusvar.h
new file mode 100644
index 00000000000..c26232bf248
--- /dev/null
+++ b/sys/arch/armv7/include/simplebusvar.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:43 jsg Exp $	*/
+
+#include <arm/simplebusvar.h>
diff --git a/sys/arch/armv7/marvell/mvmbus.c b/sys/arch/armv7/marvell/mvmbus.c
index aa7fa27b0c7..bdaf047facd 100644
--- a/sys/arch/armv7/marvell/mvmbus.c
+++ b/sys/arch/armv7/marvell/mvmbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mvmbus.c,v 1.4 2021/10/24 17:52:27 mpi Exp $ */
+/* $OpenBSD: mvmbus.c,v 1.5 2023/09/22 01:10:43 jsg Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  *
@@ -22,7 +22,7 @@
 #include <machine/bus.h>
 #include <machine/fdt.h>
 
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
 #include <armv7/marvell/mvmbusvar.h>
 
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arch/armv7/omap/omcm.c b/sys/arch/armv7/omap/omcm.c
index 6a8c03c82c0..c7fa03ae50a 100644
--- a/sys/arch/armv7/omap/omcm.c
+++ b/sys/arch/armv7/omap/omcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omcm.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
+/* $OpenBSD: omcm.c,v 1.4 2023/09/22 01:10:43 jsg Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -22,7 +22,7 @@
 
 #include <dev/ofw/openfirm.h>
 
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 struct omcm_softc {
 	struct simplebus_softc	sc_bus;
diff --git a/sys/arch/armv7/omap/omsysc.c b/sys/arch/armv7/omap/omsysc.c
index ba97e3face0..95aeb5589b3 100644
--- a/sys/arch/armv7/omap/omsysc.c
+++ b/sys/arch/armv7/omap/omsysc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omsysc.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
+/* $OpenBSD: omsysc.c,v 1.4 2023/09/22 01:10:43 jsg Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -24,7 +24,7 @@
 #include <dev/ofw/ofw_clock.h>
 #include <dev/ofw/fdt.h>
 
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 struct omsysc_softc {
 	struct simplebus_softc	sc_bus;