[src/netbsd-1-5]: src/sys/arch/prep/conf Pull up revision 1.15 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/0a50b4a9eda7
branches:  netbsd-1-5
changeset: 491573:0a50b4a9eda7
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:54:26 2001 +0000

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

diffstat:

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

diffs (25 lines):

diff -r fd51945859f9 -r 0a50b4a9eda7 sys/arch/prep/conf/GENERIC
--- a/sys/arch/prep/conf/GENERIC        Tue May 01 15:54:09 2001 +0000
+++ b/sys/arch/prep/conf/GENERIC        Tue May 01 15:54:26 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.8.2.1 2000/06/23 14:36:13 fvdl Exp $
+#      $NetBSD: GENERIC,v 1.8.2.2 2001/05/01 15:54:26 he Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/prep/conf/std.prep"
 
-#ident         "GENERIC-$Revision: 1.8.2.1 $"
+#ident         "GENERIC-$Revision: 1.8.2.2 $"
 
 maxusers       32
 
@@ -322,6 +322,7 @@
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           2       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             2       # 6to4 IPv6 over IPv4 encapsulation
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device  pty             64      # pseudo-terminals