[src/netbsd-8]: src/sys/arch/evbarm/conf Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/1b537977d962
branches:  netbsd-8
changeset: 434079:1b537977d962
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 05 20:11:18 2017 +0000

description:
Pull up following revision(s) (requested by christos in ticket #94):
        sys/arch/evbarm/conf/files.integrator: 1.12, 1.13
we don't support 'no device' so re-define it; it will get both file attachments
but that is not an error.
--
XXX: fix conflict with plrtc in sys/conf/files by re-defining.

diffstat:

 sys/arch/evbarm/conf/files.integrator |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 144efd337ac1 -r 1b537977d962 sys/arch/evbarm/conf/files.integrator
--- a/sys/arch/evbarm/conf/files.integrator     Wed Jul 05 20:07:42 2017 +0000
+++ b/sys/arch/evbarm/conf/files.integrator     Wed Jul 05 20:11:18 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.integrator,v 1.11 2015/01/27 16:35:47 jmcneill Exp $
+#      $NetBSD: files.integrator,v 1.11.10.1 2017/07/05 20:11:18 snj Exp $
 #
 # ARM, Ltd. Integrator evaluation board configuraiton info
 #
@@ -29,7 +29,7 @@
 file   arch/evbarm/ifpga/plmmc_ifpga.c         plmmc_ifpga
 
 # Integrator real-time clock
-device plrtc
+# XXX: dev/ic/pl031.c
 attach plrtc at ifpga
 file   arch/evbarm/ifpga/pl030_rtc.c           plrtc