[src/trunk]: src/sys/arch/evbarm/conf XXX: fix conflict with plrtc in sys/con...

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

details:   https://anonhg.NetBSD.org/src/rev/706db1207a19
branches:  trunk
changeset: 824866:706db1207a19
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 22 02:19:25 2017 +0000

description:
XXX: fix conflict with plrtc in sys/conf/files by re-defining.

diffstat:

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

diffs (18 lines):

diff -r 5d258fd1ca0d -r 706db1207a19 sys/arch/evbarm/conf/files.integrator
--- a/sys/arch/evbarm/conf/files.integrator     Thu Jun 22 02:09:37 2017 +0000
+++ b/sys/arch/evbarm/conf/files.integrator     Thu Jun 22 02:19:25 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.12 2017/06/22 02:19:25 christos Exp $
 #
 # ARM, Ltd. Integrator evaluation board configuraiton info
 #
@@ -29,6 +29,8 @@
 file   arch/evbarm/ifpga/plmmc_ifpga.c         plmmc_ifpga
 
 # Integrator real-time clock
+# XXX: dev/ic/pl031.c
+no device plrtc
 device plrtc
 attach plrtc at ifpga
 file   arch/evbarm/ifpga/pl030_rtc.c           plrtc