From 3f309a50a7df092f1c0c2f8dc4217c9cf401e247 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@cvs.openbsd.org>
Date: Thu, 3 Aug 2006 18:19:05 +0000
Subject: Re-enable IPMI.  Tested by beck & ckuethe prompted by deraadt

---
 sys/arch/amd64/conf/GENERIC | 4 ++--
 sys/arch/i386/conf/GENERIC  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 78e025830dc..7f1a5f5fd82 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.147 2006/07/31 11:06:15 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.148 2006/08/03 18:19:04 marco Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -56,7 +56,7 @@ pci*	at mainbus0
 #acpiec*	at acpi?
 #acpitz*	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 eed267481f6..b306afd3cd7 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.514 2006/07/31 11:06:18 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.515 2006/08/03 18:19:04 marco 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? disable	# IPMI
+ipmi0	at mainbus?		# IPMI
 esm0	at mainbus? 		# Dell Embedded Server Management
 
 isa0	at mainbus0
-- 
cgit v1.2.3