Module Name: src
Committed By: snj
Date: Wed Jul 5 20:11:18 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf [netbsd-8]: files.integrator
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.10.1 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.11.10.1
--- src/sys/arch/evbarm/conf/files.integrator:1.11 Tue Jan 27 16:35:47 2015
+++ src/sys/arch/evbarm/conf/files.integrator Wed Jul 5 20:11:18 2017
@@ -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 @@ attach plmmc at ifpga with plmmc_ifpga
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
