Module Name: src
Committed By: martin
Date: Tue Dec 19 12:51:30 UTC 2023
Modified Files:
src/sys/arch/netwinder/conf [netbsd-10]: GENERIC
Log Message:
Fix merge botch in previous
To generate a diff of this commit:
cvs rdiff -u -r1.144.4.1 -r1.144.4.2 src/sys/arch/netwinder/conf/GENERIC
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/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.144.4.1 src/sys/arch/netwinder/conf/GENERIC:1.144.4.2
--- src/sys/arch/netwinder/conf/GENERIC:1.144.4.1 Tue Dec 19 12:49:40 2023
+++ src/sys/arch/netwinder/conf/GENERIC Tue Dec 19 12:51:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.144.4.1 2023/12/19 12:49:40 martin Exp $
+# $NetBSD: GENERIC,v 1.144.4.2 2023/12/19 12:51:30 martin Exp $
#
# GENERIC machine description file
#
@@ -295,4 +295,4 @@ pseudo-device swwdog # software watch
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
-include "dev/veriexec.config"
+#include "dev/veriexec.config"
