[src/netbsd-1-5]: src/sys/arch/arm26/conf Pull up revisions 1.14-1.15 (reques...

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

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

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

diffstat:

 sys/arch/arm26/conf/GENERIC |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 146a14553368 -r 4dbd39ba8b74 sys/arch/arm26/conf/GENERIC
--- a/sys/arch/arm26/conf/GENERIC       Tue May 01 15:45:28 2001 +0000
+++ b/sys/arch/arm26/conf/GENERIC       Tue May 01 15:45:47 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.2.2.4 2000/10/04 08:24:26 itojun Exp $
+# $NetBSD: GENERIC,v 1.2.2.5 2001/05/01 15:45:47 he Exp $
 
 # GENERIC arm26 configuration -- everything I've implemented so far
 
@@ -158,9 +158,9 @@
 pseudo-device  gre             2       # generic L3 over IP tunnel
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
 pseudo-device  faith           1       # IPv[46] tcp relay translation i/f
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  sequencer       1       # MIDI sequencer
 pseudo-device  wsmux           2       # keyboard/mouse multiplexor
 
-# rnd is EXPERIMENTAL
 pseudo-device  rnd                     # /dev/random and in-kernel generator