diff options
author | Marco Peereboom <marco@cvs.openbsd.org> | 2006-01-29 17:29:31 +0000 |
---|---|---|
committer | Marco Peereboom <marco@cvs.openbsd.org> | 2006-01-29 17:29:31 +0000 |
commit | ffaecc25b227281d46a1db7e86e04e9174ba4017 (patch) | |
tree | 5002d2365e683d5d7423b459c529d5046d9e314b /sys/arch/i386/conf | |
parent | 8853b2988adaf32bd6f8bbbe4b4b5f27d93bcce6 (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/arch/i386/conf')
-rw-r--r-- | sys/arch/i386/conf/files.i386 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index ab69807f0b5..15d54da0c37 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.141 2005/11/21 17:24:26 jordan Exp $ +# $OpenBSD: files.i386,v 1.142 2006/01/29 17:29:29 marco Exp $ # # new style config file for i386 architecture # @@ -403,9 +403,7 @@ file arch/i386/i386/acpi_machdep.c acpi # # IPMI # -device ipmi attach ipmi at mainbus -file dev/ipmi.c ipmi needs-flag # Dell Embedded Systems Management device esm |