summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-07-20 22:17:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-07-20 22:17:51 +0000
commitca548032a9cc08abd9ecd654ecddab550c355b7c (patch)
tree2fa43dd5d664a684291b0f6d5b94331c76eafaf1 /sys/arch/i386/conf
parent42fe00eb16bc23400706b5f27f17abc02e755782 (diff)
no, ipmi is still not fine on some machines (since acpi got enabled)
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c3f068eddaf..873c90d3759 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.631 2008/07/08 05:21:59 dlg Exp $
+# $OpenBSD: GENERIC,v 1.632 2008/07/20 22:17:50 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -43,7 +43,7 @@ bios0 at mainbus0
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
-ipmi0 at mainbus? # IPMI
+ipmi0 at mainbus? disable # IPMI
#vmt0 at mainbus? # VMware Tools
esm0 at mainbus? # Dell Embedded Server Management
amdmsr0 at mainbus? # MSR access for AMD Geode LX CPUs with GP