[src/netbsd-1-5]: src/sys/arch/i386/conf Pull up rev. 1.23 (mirror GENERIC):

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

details:   https://anonhg.NetBSD.org/src/rev/e42f9d45f0f4
branches:  netbsd-1-5
changeset: 489489:e42f9d45f0f4
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Sep 20 18:29:30 2000 +0000

description:
Pull up rev. 1.23 (mirror GENERIC):
Enable VM86 -- it's needed for some X servers (notably, S3 Savage,
which runs the VESA BIOS in VM86 emulation in order to switch video
modes).

diffstat:

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

diffs (18 lines):

diff -r 2b7be96631dd -r e42f9d45f0f4 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Wed Sep 20 18:26:06 2000 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Wed Sep 20 18:29:30 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.14.2.4 2000/08/10 23:10:28 soda Exp $
+#      $NetBSD: CARDBUS,v 1.14.2.5 2000/09/20 18:29:30 thorpej Exp $
 #
 #      CARDBUS -- GENERIC + CardBus support
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -16,7 +16,7 @@
 
 # CPU-related options.
 options        MATH_EMULATE    # floating point emulation
-#options       VM86            # virtual 8086 emulation
+options        VM86            # virtual 8086 emulation
 options        USER_LDT        # user-settable LDT; used by WINE
 # eliminate delay no-ops in I/O; recommended on all but very old machines
 #options       DUMMY_NOPS