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

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

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

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

diffstat:

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

diffs (26 lines):

diff -r f09c8fc63704 -r 9c71df2f0ef9 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Tue May 01 14:42:56 2001 +0000
+++ b/sys/arch/alpha/conf/ALPHA Tue May 01 15:43:36 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: ALPHA,v 1.127.2.3 2001/02/26 22:02:14 he Exp $
+# $NetBSD: ALPHA,v 1.127.2.4 2001/05/01 15:43:36 he Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
 include        "arch/alpha/conf/std.alpha"
 
-ident          "ALPHA-$Revision: 1.127.2.3 $"
+ident          "ALPHA-$Revision: 1.127.2.4 $"
 
 maxusers 32
 
@@ -476,8 +476,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