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

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

details:   https://anonhg.NetBSD.org/src/rev/8e29d51155de
branches:  netbsd-1-5
changeset: 491560:8e29d51155de
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:49:02 2001 +0000

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

diffstat:

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

diffs (25 lines):

diff -r b48d6db11747 -r 8e29d51155de sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue May 01 15:48:46 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue May 01 15:49:02 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.354.2.11 2001/05/01 11:49:38 he Exp $
+#      $NetBSD: GENERIC,v 1.354.2.12 2001/05/01 15:49:02 he Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.354.2.11 $"
+#ident                 "GENERIC-$Revision: 1.354.2.12 $"
 
 maxusers       32              # estimated number of users
 
@@ -834,6 +834,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
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device  pty             64      # pseudo-terminals