summaryrefslogtreecommitdiff
path: root/sys/conf/files
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-01-29 17:29:31 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-01-29 17:29:31 +0000
commitffaecc25b227281d46a1db7e86e04e9174ba4017 (patch)
tree5002d2365e683d5d7423b459c529d5046d9e314b /sys/conf/files
parent8853b2988adaf32bd6f8bbbe4b4b5f27d93bcce6 (diff)
Disable iic whenever ipmi is enabled. This fixes boxes like Sun x4200 that
freak out when more than one device driver touch the i2c devices. Reported by: Srebrenko Sehic <ssehic at gmail dot com> ok kettenis@
Diffstat (limited to 'sys/conf/files')
-rw-r--r--sys/conf/files6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 434cc418df3..9e3229ad325 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.363 2006/01/23 14:42:54 martin Exp $
+# $OpenBSD: files,v 1.364 2006/01/29 17:29:29 marco Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -389,6 +389,10 @@ device radio
attach radio at radiobus
file dev/radio.c radio needs-flag
+# IPMI
+device ipmi
+file dev/ipmi.c ipmi needs-flag
+
# legitimate pseudo-devices
pseudo-device vnd: disk
pseudo-device ccd: disk