diff options
author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-11-27 17:56:58 +0000 |
---|---|---|
committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-11-27 17:56:58 +0000 |
commit | 2565286eefd7f793acdf603c678866fa129738be (patch) | |
tree | 34ff3e385334f42bf0ce00b8b516957520f2696c | |
parent | 6d9e00994e03b939d2460c38f9462904b9e8b2f6 (diff) |
Enable kvm86.
ok deraadt
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index cfb28b53e8a..7ec7f74df02 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.540 2006/11/27 16:47:05 grange Exp $ +# $OpenBSD: GENERIC,v 1.541 2006/11/27 17:56:57 gwk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -21,7 +21,7 @@ option I686_CPU option USER_PCICONF # user-space PCI configuration #option VM86 # Virtual 8086 emulation -#option KVM86 # Kernel Virtual 8086 emulation +option KVM86 # Kernel Virtual 8086 emulation option USER_LDT # user-settable LDT; see i386_set_ldt(2) option APERTURE # in-kernel aperture driver for XFree86 @@ -286,6 +286,11 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 +#vesabios0 at mainbus? +# option VESABIOSVERBOSE + +#option VESAFB # VESA bios framebuffer support for X11 + pcppi0 at isa? pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports |