From ad82f393fffe7b4a911c6c21d64cc8bba2e8f620 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Sat, 6 Aug 2016 17:16:13 +0000
Subject: [PATCH] Build ofw_pinctrl.o and ofw_gpio.o on armv7.  The latters
 here from the generic arm files list.  There is no point in building it on
 armish or zaurus.

ok patrick@
---
 sys/arch/arm/conf/files.arm     | 3 +--
 sys/arch/armv7/conf/files.armv7 | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 369966e04e0..c37b2c382bb 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arm,v 1.38 2016/07/11 14:51:31 kettenis Exp $
+#	$OpenBSD: files.arm,v 1.39 2016/08/06 17:16:13 kettenis Exp $
 #	$NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $
 
 # generic networking files
@@ -29,7 +29,6 @@ file	arch/arm/simplebus/simplebus.c		simplebus
 
 # FDT support
 file	dev/ofw/fdt.c
-file	dev/ofw/ofw_gpio.c
 
 include "arch/arm/cortex/files.cortex"
 
diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7
index c2d9232a16d..2a4c331caf2 100644
--- a/sys/arch/armv7/conf/files.armv7
+++ b/sys/arch/armv7/conf/files.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.armv7,v 1.20 2016/07/30 08:07:01 kettenis Exp $
+#	$OpenBSD: files.armv7,v 1.21 2016/08/06 17:16:13 kettenis Exp $
 
 maxpartitions	16
 maxusers	2 8 64
@@ -24,6 +24,10 @@ file	arch/armv7/armv7/autoconf.c
 file	arch/armv7/armv7/platform.c
 file	arch/arm/arm/disksubr.c			disk
 
+# FDT support
+file	dev/ofw/ofw_gpio.c
+file	dev/ofw/ofw_pinctrl.c
+
 include "dev/sdmmc/files.sdmmc"
 
 # Media Independent Interface (mii)
-- 
2.20.1