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

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

details:   https://anonhg.NetBSD.org/src/rev/ad41eedd00c9
branches:  netbsd-1-5
changeset: 491578:ad41eedd00c9
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:55:56 2001 +0000

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

diffstat:

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

diffs (26 lines):

diff -r 5e3a7dcfdf96 -r ad41eedd00c9 sys/arch/x68k/conf/GENERIC
--- a/sys/arch/x68k/conf/GENERIC        Tue May 01 15:55:40 2001 +0000
+++ b/sys/arch/x68k/conf/GENERIC        Tue May 01 15:55:56 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.46.2.6 2001/03/13 20:29:51 he Exp $
+#      $NetBSD: GENERIC,v 1.46.2.7 2001/05/01 15:55:56 he Exp $
 
 #
 #      GENERIC
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident                 "GENERIC-$Revision: 1.46.2.6 $"
+#ident                 "GENERIC-$Revision: 1.46.2.7 $"
 
 maxusers       8
 
@@ -304,6 +304,7 @@
 pseudo-device  gif             1       # 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
 
 #### Other device configuration