[src/netbsd-1-5]: src/sys/arch/sun3/conf Pull up revisions 1.75-1.76 (request...

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

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

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

diffstat:

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

diffs (26 lines):

diff -r cf7425c96bce -r ea62d4db2480 sys/arch/sun3/conf/GENERIC
--- a/sys/arch/sun3/conf/GENERIC        Tue May 01 15:54:45 2001 +0000
+++ b/sys/arch/sun3/conf/GENERIC        Tue May 01 15:55:04 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.68.2.3 2000/10/04 08:24:27 itojun Exp $
+# $NetBSD: GENERIC,v 1.68.2.4 2001/05/01 15:55:04 he Exp $
 
 # GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E)
 # Supports root on: ie0, le0, sd*, ...
 
 include "arch/sun3/conf/std.sun3"
 
-#ident                 "GENERIC-$Revision: 1.68.2.3 $"
+#ident                 "GENERIC-$Revision: 1.68.2.4 $"
 
 # Machines to be supported by this kernel
 options        FPU_EMULATE
@@ -211,7 +211,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  pty             64      # pseudo-terminals