[src/trunk]: src/sys/arch/i386/conf sync with GENERIC 1.400

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

details:   https://anonhg.NetBSD.org/src/rev/6c3a4ee423dd
branches:  trunk
changeset: 504507:6c3a4ee423dd
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Mar 04 07:34:20 2001 +0000

description:
sync with GENERIC 1.400

diffstat:

 sys/arch/i386/conf/LAMB |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r e5ef8c0ad15e -r 6c3a4ee423dd sys/arch/i386/conf/LAMB
--- a/sys/arch/i386/conf/LAMB   Sun Mar 04 07:30:19 2001 +0000
+++ b/sys/arch/i386/conf/LAMB   Sun Mar 04 07:34:20 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: LAMB,v 1.1 2000/11/26 03:28:41 itojun Exp $
+#      $NetBSD: LAMB,v 1.2 2001/03/04 07:34:20 itojun Exp $
 #
 #      LAMB -- for "LAMB" router, http://www.wildlab.com/
 #
@@ -6,7 +6,7 @@
 include "arch/i386/conf/std.i386"
 
 # based on:
-#ident                 "GENERIC-Revision: 1.378"
+#ident                 "GENERIC-Revision: 1.400"
 
 maxusers       32              # estimated number of users
 
@@ -76,6 +76,7 @@
 options        COMPAT_12       # NetBSD 1.2,
 options        COMPAT_13       # NetBSD 1.3,
 options        COMPAT_14       # NetBSD 1.4,
+options        COMPAT_15       # NetBSD 1.5,
 options        COMPAT_43       # and 4.3BSD
 options        COMPAT_386BSD_MBRPART # recognize old partition ID
 
@@ -349,6 +350,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
 
 # miscellaneous pseudo-devices
 pseudo-device  pty                     # pseudo-terminals