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

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

details:   https://anonhg.NetBSD.org/src/rev/37d626e33187
branches:  netbsd-1-5
changeset: 491571:37d626e33187
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:53:53 2001 +0000

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

diffstat:

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

diffs (24 lines):

diff -r 9696e309ee71 -r 37d626e33187 sys/arch/pc532/conf/GENERIC
--- a/sys/arch/pc532/conf/GENERIC       Tue May 01 15:53:32 2001 +0000
+++ b/sys/arch/pc532/conf/GENERIC       Tue May 01 15:53:53 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.10.2.2 2000/08/11 20:18:07 mason Exp $
+#      $NetBSD: GENERIC,v 1.10.2.3 2001/05/01 15:53:53 he Exp $
 #
 # GENERIC: generic kernel for most machines
 #
 
 include        "arch/pc532/conf/std.pc532"
 
-#ident                 "GENERIC-$Revision: 1.10.2.2 $"
+#ident                 "GENERIC-$Revision: 1.10.2.3 $"
 
 maxusers       8                       # estimated number of users
 
@@ -74,5 +74,6 @@
 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  ccd 4                   # Concatenated Disk Driver
 pseudo-device   rnd                     # kernel random number generator