[src/netbsd-1-5]: src/sys/arch/amiga/conf Pull up revision 1.152 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/95df6a2a1c37
branches:  netbsd-1-5
changeset: 491549:95df6a2a1c37
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:44:36 2001 +0000

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

diffstat:

 sys/arch/amiga/conf/GENERIC |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 6fca9d7b4ff4 -r 95df6a2a1c37 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Tue May 01 15:44:18 2001 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Tue May 01 15:44:36 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.143.2.5 2001/01/25 16:40:57 jhawk Exp $
+#      $NetBSD: GENERIC,v 1.143.2.6 2001/05/01 15:44:36 he Exp $
 
 #
 #if 0
@@ -16,7 +16,7 @@
 
 include "arch/amiga/conf/std.amiga"
 
-#ident                 "GENERIC-$Revision: 1.143.2.5 $"
+#ident                 "GENERIC-$Revision: 1.143.2.6 $"
 
 maxusers       8
 options        RTC_OFFSET=0
@@ -439,6 +439,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
 
 pseudo-device  view            4       # views (needed for grfcc)
 pseudo-device  pty             64      # pseudo-terminals
@@ -448,7 +449,6 @@
 #pseudo-device raid            4       # RAIDframe disk driver
 #options       RAID_AUTOCONFIG         # auto-configuration of RAID components
 
-# rnd is EXPERIMENTAL at this point.
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 #options        RND_COM                 # use "com" randomness as well (BROKEN)