[src/netbsd-1-5]: src/sys/arch/alpha/conf Pull up revisions 1.15, 1.15 (via pa...

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

details:   https://anonhg.NetBSD.org/src/rev/6fca9d7b4ff4
branches:  netbsd-1-5
changeset: 491548:6fca9d7b4ff4
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:44:18 2001 +0000

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

diffstat:

 sys/arch/alpha/conf/TCWSCONS |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 45fd395fa01c -r 6fca9d7b4ff4 sys/arch/alpha/conf/TCWSCONS
--- a/sys/arch/alpha/conf/TCWSCONS      Tue May 01 15:43:58 2001 +0000
+++ b/sys/arch/alpha/conf/TCWSCONS      Tue May 01 15:44:18 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: TCWSCONS,v 1.11 2000/06/14 22:02:15 veego Exp $
+# $NetBSD: TCWSCONS,v 1.11.2.1 2001/05/01 15:44:18 he Exp $
 #
 # TURBOchannel Alpha DEC3000
 
 include        "arch/alpha/conf/std.alpha"
 
-#ident                 "GENERIC-$Revision: 1.11 $"
+#ident                 "GENERIC-$Revision: 1.11.2.1 $"
 
 maxusers 32
 
@@ -165,8 +165,9 @@
 #pseudo-device gre             2       # generic L3 over IP tunnel
 #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
+pseudo-device  rnd                     # /dev/random and in-kernel generator
 #options       RND_COM                 # use "com" randomness too