summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/files.i38610
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 09fa9fc43e9..0fb06847a5b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.432 2005/10/04 06:15:40 grange Exp $
+# $OpenBSD: GENERIC,v 1.433 2005/10/04 22:04:23 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -60,6 +60,8 @@ pci* at mainbus0
#acpitimer* at acpi?
#hpet* at acpi?
+#ipmi0 at mainbus? # IPMI
+
option ACPIVERBOSE
#option ACPI_ENABLE
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 6882ae53c56..b05a2937e34 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.137 2005/09/26 22:32:03 miod Exp $
+# $OpenBSD: files.i386,v 1.138 2005/10/04 22:04:23 marco Exp $
#
# new style config file for i386 architecture
#
@@ -398,3 +398,11 @@ include "dev/gpio/files.gpio"
include "../../../dev/acpi/files.acpi"
file arch/i386/i386/acpi_machdep.c acpi
+
+#
+# IPMI
+#
+device ipmi
+attach ipmi at mainbus
+file dev/ipmi.c ipmi needs-flag
+