[src/netbsd-1-5]: src/sys/arch/mvme68k/conf Pull up revision 1.23 (via patch, ...

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

details:   https://anonhg.NetBSD.org/src/rev/e800fdd70490
branches:  netbsd-1-5
changeset: 491566:e800fdd70490
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:51:04 2001 +0000

description:
Pull up revision 1.23 (via patch, requested by he):
  Add pseudo-device vlan.
  Make sure "rnd is EXPERIMENTAL" comment is removed.

diffstat:

 sys/arch/mvme68k/conf/GENERIC |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 350250b137c6 -r e800fdd70490 sys/arch/mvme68k/conf/GENERIC
--- a/sys/arch/mvme68k/conf/GENERIC     Tue May 01 15:50:42 2001 +0000
+++ b/sys/arch/mvme68k/conf/GENERIC     Tue May 01 15:51:04 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: GENERIC,v 1.8.2.4 2000/10/17 19:42:49 scw Exp $
+#      $NetBSD: GENERIC,v 1.8.2.5 2001/05/01 15:51:04 he Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
-#ident                 "GENERIC-$Revision: 1.8.2.4 $"
+#ident                 "GENERIC-$Revision: 1.8.2.5 $"
 
 # Boards this kernel supports
 options        MVME147
@@ -66,6 +66,7 @@
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
 pseudo-device  pty             64      # pseudo-terminals
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  vnd 2
 
 # random number generator pseudo-device