[src/netbsd-1-5]: src/sys/arch/i386/conf Pull up revision 1.8 (requested by he):

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

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

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

diffstat:

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

diffs (25 lines):

diff -r 8e29d51155de -r f134af1e1eed sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Tue May 01 15:49:02 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Tue May 01 15:49:21 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.2.2.6 2001/05/01 11:49:59 he Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.2.2.7 2001/05/01 15:49:21 he Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.2.2.6 $"
+#ident                 "GENERIC-$Revision: 1.2.2.7 $"
 
 maxusers       32              # estimated number of users
 
@@ -701,6 +701,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