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

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

details:   https://anonhg.NetBSD.org/src/rev/1ec272de7a3f
branches:  trunk
changeset: 518432:1ec272de7a3f
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Nov 30 02:40:57 2001 +0000

description:
sync with latest GENERIC.

diffstat:

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

diffs (51 lines):

diff -r 97a69872125d -r 1ec272de7a3f sys/arch/i386/conf/LAMB
--- a/sys/arch/i386/conf/LAMB   Fri Nov 30 02:27:20 2001 +0000
+++ b/sys/arch/i386/conf/LAMB   Fri Nov 30 02:40:57 2001 +0000
@@ -1,13 +1,11 @@
-#      $NetBSD: LAMB,v 1.14 2001/11/20 12:56:30 lukem Exp $
+#      $NetBSD: LAMB,v 1.15 2001/11/30 02:40:57 itojun Exp $
 #
-#      LAMB -- for "LAMB" router, http://www.wildlab.com/
-#      Be sure to check pkgsrc/sysutils/lambd as well.
+#      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-# based on:
-#ident                 "GENERIC-Revision: 1.414"
+#ident                 "GENERIC-$Revision: 1.15 $"
 
 maxusers       32              # estimated number of users
 
@@ -24,6 +22,8 @@
 # eliminate delay no-ops in I/O; recommended on all but very old machines
 #options       DUMMY_NOPS
 
+options        MTRR            # memory-type range register syscall support
+
 # delay between "rebooting ..." message and hardware reset, in milliseconds
 #options       CPURESET_DELAY=2000
 
@@ -233,7 +233,7 @@
 #options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
 
 # ISA bus support
-isa*   at mainbus?
+isa0   at mainbus?
 
 # ISA Plug-and-Play bus support
 isapnp0        at isa?
@@ -358,6 +358,7 @@
 #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  bridge                  # simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device  pty                     # pseudo-terminals
@@ -373,3 +374,4 @@
 # wscons pseudo-devices
 pseudo-device  wsmux                   # mouse & keyboard multiplexor
 pseudo-device  wsfont
+