Module Name: src
Committed By: christos
Date: Thu Jun 22 02:19:25 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: files.integrator
Log Message:
XXX: fix conflict with plrtc in sys/conf/files by re-defining.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/files.integrator
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/files.integrator
diff -u src/sys/arch/evbarm/conf/files.integrator:1.11 src/sys/arch/evbarm/conf/files.integrator:1.12
--- src/sys/arch/evbarm/conf/files.integrator:1.11 Tue Jan 27 11:35:47 2015
+++ src/sys/arch/evbarm/conf/files.integrator Wed Jun 21 22:19:25 2017
@@ -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 @@ attach plmmc at ifpga with plmmc_ifpga
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
