[src/netbsd-1-5]: src/sys/arch/next68k/conf Pull up revisions 1.37-1.38 (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/f7bdce65352b
branches:  netbsd-1-5
changeset: 491569:f7bdce65352b
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:53:14 2001 +0000

description:
Pull up revisions 1.37-1.38 (requested by he):
  Add pseudo-device vlan.
  Make sure "rnd is EXPERIMENTAL" comment is removed.

diffstat:

 sys/arch/next68k/conf/GENERIC |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0686de957446 -r f7bdce65352b sys/arch/next68k/conf/GENERIC
--- a/sys/arch/next68k/conf/GENERIC     Tue May 01 15:51:49 2001 +0000
+++ b/sys/arch/next68k/conf/GENERIC     Tue May 01 15:53:14 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.30.2.3 2000/10/06 23:19:44 deberg Exp $
+# $NetBSD: GENERIC,v 1.30.2.4 2001/05/01 15:53:14 he Exp $
 #
 # GENERIC next68k
 #
@@ -6,7 +6,7 @@
 
 include "arch/next68k/conf/std.next68k"
 
-#ident                 "GENERIC-$Revision: 1.30.2.3 $"
+#ident                 "GENERIC-$Revision: 1.30.2.4 $"
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers       16
@@ -188,7 +188,7 @@
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
-# rnd is EXPERIMENTAL
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 #pseudo-device wsmux           2       # mouse & keyboard multiplexor