[src/trunk]: src/sys/arch/sparc64/conf turn on MODULAR by default

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a09555c7d8a0
branches:  trunk
changeset: 785415:a09555c7d8a0
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 12 21:41:40 2013 +0000

description:
turn on MODULAR by default

diffstat:

 sys/arch/sparc64/conf/GENERIC |  6 ++++--
 sys/arch/sparc64/conf/MODULAR |  5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r db89bc1f91a4 -r a09555c7d8a0 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC     Tue Mar 12 21:12:47 2013 +0000
+++ b/sys/arch/sparc64/conf/GENERIC     Tue Mar 12 21:41:40 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.162 2013/03/02 02:42:21 christos Exp $
+# $NetBSD: GENERIC,v 1.163 2013/03/12 21:41:40 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.162 $"
+#ident                 "GENERIC-$Revision: 1.163 $"
 
 maxusers       64
 
@@ -60,6 +60,8 @@
 options        SYSVSEM         # System V semaphores
 options        SYSVSHM         # System V shared memory
 
+options                MODULAR         # new style module(7) framework
+
 options        USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
diff -r db89bc1f91a4 -r a09555c7d8a0 sys/arch/sparc64/conf/MODULAR
--- a/sys/arch/sparc64/conf/MODULAR     Tue Mar 12 21:12:47 2013 +0000
+++ b/sys/arch/sparc64/conf/MODULAR     Tue Mar 12 21:41:40 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.3 2011/01/05 13:29:27 martin Exp $
+# $NetBSD: MODULAR,v 1.4 2013/03/12 21:41:40 christos Exp $
 #
 # MODULAR kernel - like GENERIC, but excluding lots of stuff that can
 # be loaded as a module later
@@ -6,8 +6,9 @@
 
 include        "arch/sparc64/conf/GENERIC"
 
-#ident         "MODULAR-$Revision: 1.3 $"
+#ident         "MODULAR-$Revision: 1.4 $"
 
+no options     MODULAR
 options                MODULAR         # allow loading of kernel modules
 options                INSECURE        # disable kernel security levels initially
                                # (we can't load file system modules otherwise)