[src/netbsd-1-5]: src/sys/arch/alpha/conf Pull up revisions 1.171, 1.175 (requ...

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

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

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

diffstat:

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

diffs (28 lines):

diff -r 9c71df2f0ef9 -r 45fd395fa01c sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Tue May 01 15:43:36 2001 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Tue May 01 15:43:58 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.157.2.5 2000/10/04 08:24:25 itojun Exp $
+# $NetBSD: GENERIC,v 1.157.2.6 2001/05/01 15:43:58 he Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #
@@ -6,7 +6,7 @@
 
 include        "arch/alpha/conf/std.alpha"
 
-#ident                 "GENERIC-$Revision: 1.157.2.5 $"
+#ident                 "GENERIC-$Revision: 1.157.2.6 $"
 
 maxusers 32
 
@@ -431,8 +431,8 @@
 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  sequencer       1       # MIDI sequencer
 
-# rnd is EXPERIMENTAL
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 #options       RND_COM                 # use "com" randomness too