[src/netbsd-1-5]: src/sys/arch/atari/conf Pull up revisions 1.74-1.75 (reques...

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

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

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

diffstat:

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

diffs (33 lines):

diff -r 581024e45c75 -r 37aec3b480a1 sys/arch/atari/conf/GENERIC
--- a/sys/arch/atari/conf/GENERIC       Tue May 01 15:46:30 2001 +0000
+++ b/sys/arch/atari/conf/GENERIC       Tue May 01 15:47:25 2001 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.66.2.3 2000/10/04 08:24:26 itojun Exp $
+#      $NetBSD: GENERIC,v 1.66.2.4 2001/05/01 15:47:25 he Exp $
 #
 # Generic atari
 #
@@ -8,7 +8,7 @@
 
 include "arch/atari/conf/std.atari"
 
-#ident                 "GENERIC-$Revision: 1.66.2.3 $"
+#ident                 "GENERIC-$Revision: 1.66.2.4 $"
 
 #
 # Add support for about 16 users. This variable is used to size
@@ -168,12 +168,12 @@
 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       # concatenating disk driver
 #pseudo-device raid            4       # RAIDframe disk driver
 #options       RAID_AUTOCONFIG         # auto-configuration of RAID components
 pseudo-device  md              2       # Boot memory disk
 pseudo-device  ipfilter                # IP filtering device
-# rnd is EXPERIMENTAL
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 
 #