summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2010-02-28 19:39:55 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2010-02-28 19:39:55 +0000
commit04333f91a82d1f62e49a9775f5fd1e04c64661e6 (patch)
tree34007dd31f433b3dcf916934b9048e6be4bacfb0 /sys/arch/amd64/conf
parent86f7cd390ed8e186e4a281573a28eb1dfd376997 (diff)
enable mpii
ok marco deraadt
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 3885a8c6878..3cea35ee057 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.285 2010/01/03 18:37:24 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.286 2010/02/28 19:39:54 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -344,6 +344,8 @@ arc* at pci? # Areca RAID Controller
scsibus* at arc?
mpi* at pci? # LSI Logic Message Passing Interface
scsibus* at mpi?
+mpii* at pci? # LSI Message Passing Interface II
+scsibus* at mpii?
gdt* at pci? # ICP Vortex GDT RAID controllers
scsibus* at gdt?
twe* at pci? # 3ware Escalade RAID controllers
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index d5a493e23c3..1ad0ff248c0 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.109 2009/11/29 21:25:14 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.110 2010/02/28 19:39:54 jsg Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -174,6 +174,8 @@ arc* at pci? # Areca RAID Controller
scsibus* at arc?
mpi* at pci? # LSI Logic Message Passing Interface
scsibus* at mpi?
+mpii* at pci? # LSI Message Passing Interface II
+scsibus* at mpii?
gdt* at pci? # ICP Vortex GDT RAID controllers
scsibus* at gdt?
#aac* at pci? # Adaptec FSA RAID controllers