diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2006-06-01 19:00:34 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2006-06-01 19:00:34 +0000 |
| commit | 4491e79ae60b2775b712b8c0872bf327842fd946 (patch) | |
| tree | 78381285112876093d99168adbec555e9b018ef1 /sys | |
| parent | 3c4b6903a74b76dc090c657b89a5534d5237db49 (diff) | |
Compile broken ipmi into GENERIC, so it's easy for marco to fix
it by enabling it, but leave it disabled by default so it doesn't
screw people over until it is fixed.
ok dlg@, asked for by deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | 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 4e53e27e38c..a85d109aea7 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.139 2006/06/01 00:35:51 beck Exp $ +# $OpenBSD: GENERIC,v 1.140 2006/06/01 19:00:33 beck 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? # IPMI +ipmi0 at mainbus? disable # IPMI option PCIVERBOSE option USBVERBOSE diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 827c6ad7bb9..48111e7ff96 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.502 2006/06/01 00:35:51 beck Exp $ +# $OpenBSD: GENERIC,v 1.503 2006/06/01 19:00:33 beck 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? # IPMI +ipmi0 at mainbus? disable # IPMI esm0 at mainbus? # Dell Embedded Server Management isa0 at mainbus0 |