Module Name: src
Committed By: jmmv
Date: Mon Jan 18 23:40:07 UTC 2010
Modified Files:
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/shark/conf: GENERIC
Log Message:
Enable 'options MODULAR' in macppc and shark GENERIC kernels now that the
modules work.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/shark/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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.277 src/sys/arch/macppc/conf/GENERIC:1.278
--- src/sys/arch/macppc/conf/GENERIC:1.277 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/macppc/conf/GENERIC Mon Jan 18 23:40:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.277 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: GENERIC,v 1.278 2010/01/18 23:40:06 jmmv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.277 $"
+#ident "GENERIC-$Revision: 1.278 $"
maxusers 32
@@ -40,6 +40,7 @@
options SYSVSHM # System V shared memory
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+options MODULAR # new style module framework
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.86 src/sys/arch/shark/conf/GENERIC:1.87
--- src/sys/arch/shark/conf/GENERIC:1.86 Sat Dec 5 20:11:17 2009
+++ src/sys/arch/shark/conf/GENERIC Mon Jan 18 23:40:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.86 2009/12/05 20:11:17 pooka Exp $
+# $NetBSD: GENERIC,v 1.87 2010/01/18 23:40:06 jmmv Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.86 $"
+#ident "GENERIC-$Revision: 1.87 $"
# estimated number of users
maxusers 32
@@ -152,6 +152,7 @@
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options MODULAR # new style module framework
# Development and Debugging options
