[src/netbsd-1-5]: src/sys/arch/hp300/conf Pull up revisions 1.62-1.63 (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/a1a67d265cc8
branches:  netbsd-1-5
changeset: 491558:a1a67d265cc8
user:      he <he%NetBSD.org@localhost>
date:      Tue May 01 15:48:27 2001 +0000

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

diffstat:

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

diffs (25 lines):

diff -r d83fd8c5c171 -r a1a67d265cc8 sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC       Tue May 01 15:48:08 2001 +0000
+++ b/sys/arch/hp300/conf/GENERIC       Tue May 01 15:48:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.55.2.3 2000/10/04 08:24:26 itojun Exp $
+#      $NetBSD: GENERIC,v 1.55.2.4 2001/05/01 15:48:27 he Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -6,7 +6,7 @@
 # Include attributes common to all hp300s
 include "arch/hp300/conf/std.hp300"
 
-#ident                 "GENERIC-$Revision: 1.55.2.3 $"
+#ident                 "GENERIC-$Revision: 1.55.2.4 $"
 
 # Support for various CPU types
 options        HP320
@@ -190,5 +190,5 @@
 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
-# rnd is EXPERIMENTAL
+pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  rnd                     # /dev/random and in-kernel generator