[src/trunk]: src/sys/arch/sandpoint/conf double vlan pseudo-device removed

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

details:   https://anonhg.NetBSD.org/src/rev/16ade2161f2a
branches:  trunk
changeset: 340640:16ade2161f2a
user:      phx <phx%NetBSD.org@localhost>
date:      Mon Sep 21 23:31:41 2015 +0000

description:
double vlan pseudo-device removed

diffstat:

 sys/arch/sandpoint/conf/GENERIC |  5 ++---
 sys/arch/sandpoint/conf/KUROBOX |  9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 167b15390b97 -r 16ade2161f2a sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Mon Sep 21 21:50:16 2015 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Mon Sep 21 23:31:41 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2015/09/07 23:01:08 phx Exp $
+# $NetBSD: GENERIC,v 1.90 2015/09/21 23:31:41 phx Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.89 $"
+#ident                 "GENERIC-$Revision: 1.90 $"
 
 maxusers       32
 
@@ -323,7 +323,6 @@
 #pseudo-device pf                      # PF packet filter
 #pseudo-device pflog                   # PF log if
 #pseudo-device sl                      # Serial Line IP
-#pseudo-device vlan                    # IEEE 802.1q encapsulation
 #pseudo-device tun                     # network tunneling over tty
 #pseudo-device tap                     # virtual Ethernet
 #pseudo-device gre                     # generic L3 over IP tunnel
diff -r 167b15390b97 -r 16ade2161f2a sys/arch/sandpoint/conf/KUROBOX
--- a/sys/arch/sandpoint/conf/KUROBOX   Mon Sep 21 21:50:16 2015 +0000
+++ b/sys/arch/sandpoint/conf/KUROBOX   Mon Sep 21 23:31:41 2015 +0000
@@ -1,10 +1,17 @@
-#      $NetBSD: KUROBOX,v 1.5 2012/05/12 10:27:17 nisimura Exp $
+#      $NetBSD: KUROBOX,v 1.6 2015/09/21 23:31:41 phx Exp $
 #
 # KuroBox/LinkStation support
 #
 
 include "arch/sandpoint/conf/GENERIC"
 
+options        DIAGNOSTIC      # cheap kernel consistency checks
+options        DEBUG           # expensive debugging checks/support
+makeoptions    DEBUG="-g"
+
+options                NOR_DEBUG
+options                NOR_VERBOSE
+
 no com0
 no satmgr0
 com0   at eumb? unit 1                 # console at 0x4600