Module Name: src
Committed By: jmcneill
Date: Tue Aug 23 12:27:01 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: GENERIC
Log Message:
pull in GENERIC.local if it exists
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/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/usermode/conf/GENERIC
diff -u src/sys/arch/usermode/conf/GENERIC:1.11 src/sys/arch/usermode/conf/GENERIC:1.12
--- src/sys/arch/usermode/conf/GENERIC:1.11 Mon Aug 22 15:28:34 2011
+++ src/sys/arch/usermode/conf/GENERIC Tue Aug 23 12:27:01 2011
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.11 2011/08/22 15:28:34 reinoud Exp $
+# $NetBSD: GENERIC,v 1.12 2011/08/23 12:27:01 jmcneill Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -44,3 +44,6 @@
ld0 at mainbus?
pseudo-device loop
+
+# Pull in optional local configuration
+cinclude "arch/usermode/conf/GENERIC.local"
