summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-04-06 20:25:15 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-04-06 20:25:15 +0000
commitc6ddcea9c34ef0318b872ccc5ec07b144947a6db (patch)
treeae802245e342faac1d532fb4f5e5cf2285dda89e /sys/arch/i386/conf/GENERIC
parentbc1b7398df8a7ea1465bb2d937936f2f61bfa17d (diff)
Hook up mfi, remains disabled.
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b38eff6b574..a7c8a700b92 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.479 2006/03/29 14:10:52 jsg Exp $
+# $OpenBSD: GENERIC,v 1.480 2006/04/06 20:25:13 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -59,7 +59,7 @@ isa0 at gscpcib?
eisa0 at mainbus0
pci* at mainbus0
-option ACPIVERBOSE
+#option ACPIVERBOSE
#option ACPI_ENABLE
#acpi0 at mainbus?
@@ -335,6 +335,8 @@ scsibus* at twe?
#scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
scsibus* at ami?
+#mfi* at pci? # LSI MegaRAID SAS controllers
+#scsibus* at mfi?
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
cac* at eisa?
scsibus* at cac?