[src/netbsd-1-5]: src/sys/arch/pmax/conf Pull up revision 1.86 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/fd51945859f9
branches:  netbsd-1-5
changeset: 491572:fd51945859f9
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:54:09 2001 +0000

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

diffstat:

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

diffs (25 lines):

diff -r 37d626e33187 -r fd51945859f9 sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC        Tue May 01 15:53:53 2001 +0000
+++ b/sys/arch/pmax/conf/GENERIC        Tue May 01 15:54:09 2001 +0000
@@ -1,11 +1,11 @@
 #
-#      $NetBSD: GENERIC,v 1.77.2.2 2000/08/11 20:18:07 mason Exp $
+#      $NetBSD: GENERIC,v 1.77.2.3 2001/05/01 15:54:09 he Exp $
 #
 # Distribution kernel (any model) kernel config file
 #
 include                "arch/pmax/conf/std.pmax"
 
-#ident                 "GENERIC-$Revision: 1.77.2.2 $"
+#ident                 "GENERIC-$Revision: 1.77.2.3 $"
 
 maxusers       64
 
@@ -192,6 +192,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
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 
 pseudo-device  vnd              4      # virtual disk ick
 pseudo-device  ccd              4      # concatenated disks