[src/netbsd-1-5]: src/sys/arch/mac68k/conf Pull up revision 1.109 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/d31e198e3292
branches:  netbsd-1-5
changeset: 491563:d31e198e3292
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:50:07 2001 +0000

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

diffstat:

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

diffs (24 lines):

diff -r e83af563d87e -r d31e198e3292 sys/arch/mac68k/conf/GENERIC
--- a/sys/arch/mac68k/conf/GENERIC      Tue May 01 15:49:43 2001 +0000
+++ b/sys/arch/mac68k/conf/GENERIC      Tue May 01 15:50:07 2001 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: GENERIC,v 1.102.2.3 2000/08/06 12:56:18 briggs Exp $
+#      $NetBSD: GENERIC,v 1.102.2.4 2001/05/01 15:50:07 he Exp $
 #
 # GENERIC
 
 include        "arch/mac68k/conf/std.mac68k"
 
-#ident                 "GENERIC-$Revision: 1.102.2.3 $"
+#ident                 "GENERIC-$Revision: 1.102.2.4 $"
 
 maxusers       16              # estimated number of users
 
@@ -252,6 +252,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  grf             2       # grf emulation for wscons