Move the pciecam stanza back into files.arm64 since armv7 has its own

pciecam(4) implementation hidden away in arch/armv7/vexpress.

Unbreaks armv7 kernel builds.

diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64
index b22dbc7..6b4517f 100644 (file)
--- a/sys/arch/arm64/conf/files.arm64
+++ b/sys/arch/arm64/conf/files.arm64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.arm64,v 1.39 2021/05/17 19:43:38 kettenis Exp $
+# $OpenBSD: files.arm64,v 1.40 2021/05/18 11:39:37 kettenis Exp $
 
 maxpartitions  16
 maxusers       2 8 128
@@ -156,6 +156,10 @@ device     bcmintc
 attach bcmintc at fdt
 file   arch/arm64/dev/bcm2836_intr.c           bcmintc
 
+device pciecam: pcibus
+attach pciecam at fdt
+file   dev/fdt/pciecam.c                       pciecam
+
 device smmu
 attach smmu at fdt with smmu_fdt
 file   arch/arm64/dev/smmu.c                   smmu

diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 26b5d60..9e0c3a8 100644 (file)
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.fdt,v 1.150 2021/05/17 19:43:37 kettenis Exp $
+#      $OpenBSD: files.fdt,v 1.151 2021/05/18 11:39:37 kettenis Exp $
 #
 # Config file and device description for machine-independent FDT code.
 # Included by ports that need it.
@@ -11,10 +11,6 @@ device       graphaudio: audio
 attach graphaudio at fdt
 file   dev/fdt/graphaudio.c            graphaudio
 
-device pciecam: pcibus
-attach pciecam at fdt
-file   dev/fdt/pciecam.c               pciecam
-
 device simpleamp
 attach simpleamp at fdt
 file   dev/fdt/simpleamp.c             simpleamp