[src/netbsd-1-5]: src/sys/arch/luna68k/conf Pull up revisions 1.14-1.15 (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/e83af563d87e
branches:  netbsd-1-5
changeset: 491562:e83af563d87e
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:49:43 2001 +0000

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

diffstat:

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

diffs (26 lines):

diff -r f134af1e1eed -r e83af563d87e sys/arch/luna68k/conf/GENERIC
--- a/sys/arch/luna68k/conf/GENERIC     Tue May 01 15:49:21 2001 +0000
+++ b/sys/arch/luna68k/conf/GENERIC     Tue May 01 15:49:43 2001 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: GENERIC,v 1.5.2.3 2000/10/04 08:24:26 itojun Exp $
+#      $NetBSD: GENERIC,v 1.5.2.4 2001/05/01 15:49:43 he Exp $
 #
 #      GENERIC LUNA68K
 #
 include                "arch/luna68k/conf/std.luna68k"
 
-#ident                 "GENERIC-$Revision: 1.5.2.3 $"
+#ident                 "GENERIC-$Revision: 1.5.2.4 $"
 
 maxusers       8
 
@@ -131,8 +131,8 @@
 #pseudo-device raid            2       # RAIDframe disk driver
 #pseudo-device sl              1       # SLIP interfaces
 #pseudo-device tun             2       # Network "tunnel" device
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 #pseudo-device vnd             2       # disk-like interface to files
 
-# rnd is EXPERIMENTAL
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 #options       RND_COM                 # use "com" randomness too