summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2012-08-14 00:54:13 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2012-08-14 00:54:13 +0000
commit3617821c1234450e4ed44b25aa792015d5d154eb (patch)
tree89088d7964656a415af2e9deba02b8e17e71f80c /sys/arch
parentcf82e9c8980350eb9fe39797858d11056283fb68 (diff)
enable mfii(4).
ok deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9d92f7fb7f6..ede6f40d7bf 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.330 2012/08/03 16:37:19 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.331 2012/08/14 00:54:12 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -340,6 +340,7 @@ twe* at pci? # 3ware Escalade RAID controllers
#aac* at pci? # Adaptec FSA RAID controllers
ami* at pci? # AMI MegaRAID controllers
mfi* at pci? # LSI MegaRAID SAS controllers
+mfii* at pci? # LSI MegaRAID SAS Fusion controllers
#cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c757997cbc1..a5d87b9e99d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.737 2012/08/03 16:37:19 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.738 2012/08/14 00:54:12 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -442,6 +442,7 @@ twe* at pci? # 3ware Escalade RAID controllers
#aac* at pci? # Adaptec FSA RAID controllers
ami* at pci? # AMI MegaRAID controllers
mfi* at pci? # LSI MegaRAID SAS controllers
+mfii* at pci? # LSI MegaRAID SAS Fusion controllers
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
cac* at eisa?
ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers