summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2006-06-01 00:35:52 +0000
committerBob Beck <beck@cvs.openbsd.org>2006-06-01 00:35:52 +0000
commit036a4bccc48a4a1253ed19876c715316238521c8 (patch)
tree00bccb0cb1175f21aa1e9691230eb145126cb295 /sys/arch/i386
parent29301d8cd54eca6a042ad48dd540c2afae08c30e (diff)
Disable ipmi in GENERIC for the moment - it breaks too much stuff
on any of my sun amd64's as well as other ones (hp). We can re-enable it again when marco fixes it to be stable. ok deraadt@ and the crocodile hunter..
Diffstat (limited to 'sys/arch/i386')
-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 27a1e62e3d7..827c6ad7bb9 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.501 2006/05/31 03:25:08 dlg Exp $
+# $OpenBSD: GENERIC,v 1.502 2006/06/01 00:35:51 beck Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -47,7 +47,7 @@ cpu0 at mainbus?
bios0 at mainbus0
apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
-ipmi0 at mainbus? # IPMI
+#ipmi0 at mainbus? # IPMI
esm0 at mainbus? # Dell Embedded Server Management
isa0 at mainbus0