[src/netbsd-1-5]: src/sys/arch/cobalt/conf Pull up revision 1.14 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/d83fd8c5c171
branches:  netbsd-1-5
changeset: 491557:d83fd8c5c171
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:48:08 2001 +0000

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

diffstat:

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

diffs (22 lines):

diff -r aa79b6f14888 -r d83fd8c5c171 sys/arch/cobalt/conf/GENERIC
--- a/sys/arch/cobalt/conf/GENERIC      Tue May 01 15:47:46 2001 +0000
+++ b/sys/arch/cobalt/conf/GENERIC      Tue May 01 15:48:08 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: GENERIC,v 1.8.2.3 2000/11/14 03:28:00 tv Exp $
+#      $NetBSD: GENERIC,v 1.8.2.4 2001/05/01 15:48:08 he Exp $
 
 include        "arch/cobalt/conf/std.cobalt"
 
-#ident                 "GENERIC-$Revision: 1.8.2.3 $"
+#ident                 "GENERIC-$Revision: 1.8.2.4 $"
 
 maxusers       32
 
@@ -233,6 +233,7 @@
 #pseudo-device gif             4               # RFC1933  tunnel
 #pseudo-device faith           1               # IPv[46] tcp relay translation 
 #pseudo-device stf             1               # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 
 # Miscellaneous pseudo-devices
 pseudo-device  pty             64              # pseudo-terminals