summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-26 17:10:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-26 17:10:46 +0000
commita05cf1cf173171bb9fe2f11155e0074f3afdd327 (patch)
tree1e6537bf0a2ad16e8a5b5b34bf07f9926a6b10a2 /sys/arch/i386/conf/GENERIC
parentc76c4eab21094e895bc49910778dae42e8e8a690 (diff)
use the exact same policy for choosing apic on all 3 types of kernel.
ok kettenis
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8165d129ae0..2fd5d670c1d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.644 2008/12/01 23:48:46 todd Exp $
+# $OpenBSD: GENERIC,v 1.645 2008/12/26 17:10:45 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -40,6 +40,7 @@ mainbus0 at root
cpu0 at mainbus?
bios0 at mainbus0
+ioapic* at mainbus?
apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
acpi0 at bios?
pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
@@ -56,6 +57,7 @@ acpibtn* at acpi?
acpicpu* at acpi?
#acpidock* at acpi?
acpiec* at acpi?
+acpimadt0 at acpi?
acpiprt* at acpi?
acpitz* at acpi?
acpiasus* at acpi?