summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2009-01-13 13:53:51 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2009-01-13 13:53:51 +0000
commitc8bbebfc17c8bb1c3bcfaa89aaa1f8f3586e061b (patch)
tree4c47917947e9c106b7c40996bbcf0ed6f261cdd9 /sys/arch/i386/conf/GENERIC
parent9c7e0fea63c2ab02df4f18e020bf1813e4896cb3 (diff)
Turn mpbios into a real device, such that people can disable it on crappy
BIOSes. ok deraadt@ (for the amd64 bit, or the i386 bit, can't remember which)
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 62aca4ed821..c5d9ff0663c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.647 2009/01/06 23:03:16 jasper Exp $
+# $OpenBSD: GENERIC,v 1.648 2009/01/13 13:53:50 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -43,6 +43,7 @@ bios0 at mainbus0
ioapic* at mainbus?
apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
acpi0 at bios?
+mpbios0 at bios0
pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
ipmi0 at mainbus? disable # IPMI
#vmt0 at mainbus? # VMware Tools