From 034e75d22e9fec0a70df06f1255b6448c8021d6b Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sat, 6 Jun 2009 03:20:59 +0000 Subject: option X86EMU is how this subsystem is brought into a kernel --- sys/arch/i386/conf/GENERIC | 4 ++-- sys/arch/i386/conf/files.i386 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/arch/i386/conf') diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 8d2c87edc0b..d293a9dcf05 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.663 2009/06/06 00:35:00 pirofti Exp $ +# $OpenBSD: GENERIC,v 1.664 2009/06/06 03:20:57 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -340,7 +340,7 @@ pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? -option VGA_POST # we can re-POST video cards +option X86EMU # to POST video cards vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index ffe4ccef9e1..ad1befb9562 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.191 2009/06/06 00:35:00 pirofti Exp $ +# $OpenBSD: files.i386,v 1.192 2009/06/06 03:20:58 deraadt Exp $ # # new style config file for i386 architecture # @@ -103,7 +103,7 @@ include "../../../dev/pci/files.pci" file arch/i386/pci/pci_machdep.c pci file arch/i386/pci/pciide_machdep.c pciide file arch/i386/pci/pcic_pci_machdep.c pcic_pci -file arch/i386/pci/vga_post.c vga_pci & vga_post +file arch/i386/pci/vga_post.c vga_pci & x86emu # PCI-Host bridge chipsets device pchb: pcibus, agpbus -- cgit v1.2.3