summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index f898483319f..1e0059bd2eb 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.234 2008/06/12 19:45:05 robert Exp $
+# $OpenBSD: GENERIC,v 1.235 2008/06/15 15:35:00 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -50,7 +50,7 @@ acpiprt* at acpi?
acpitz* at acpi?
acpithinkpad* at acpi?
-ipmi0 at mainbus? disable # IPMI
+ipmi0 at mainbus? # IPMI
option PCIVERBOSE
option USBVERBOSE
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 47bbb79feb1..41d1b37931c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.622 2008/06/14 21:31:46 mbalmer Exp $
+# $OpenBSD: GENERIC,v 1.623 2008/06/15 15:34:57 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? disable # IPMI
+ipmi0 at mainbus? # IPMI
esm0 at mainbus? # Dell Embedded Server Management
amdmsr0 at mainbus? # AMD MSR access