summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-03 14:58:25 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-03 14:58:25 +0000
commit5e4efd8e0175ca2401bc3db0e1561ad6f914f8c7 (patch)
tree7dd57f03ecd13cefb1ca1df69b0405f49f02c6a3 /sys
parent45b8c7e0a6241c8b459ae95e38165a304a6557b8 (diff)
enable ciss; deraadt@ ok
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8f33a4ac0da..2f1e58e3b17 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.76 2005/08/03 02:10:43 dlg Exp $
+# $OpenBSD: GENERIC,v 1.77 2005/08/03 14:58:24 mickey Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -211,8 +211,8 @@ ami* at pci? # AMI MegaRAID controllers
scsibus* at ami?
#cac* at pci? # Compaq Smart ARRAY RAID controllers
#scsibus* at cac?
-#ciss* at pci? # Compaq Smart ARRAY 5* Controllers
-#scsibus* at ciss?
+ciss* at pci? # Compaq Smart ARRAY [56]* Controllers
+scsibus* at ciss?
#iha* at pci? # Initio Ultra/UltraWide SCSI controllers
#scsibus* at iha?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5475e110ad4..02ffeb97a7c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.423 2005/08/03 02:10:44 dlg Exp $
+# $OpenBSD: GENERIC,v 1.424 2005/08/03 14:58:24 mickey Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -297,8 +297,8 @@ scsibus* at ami?
cac* at pci? # Compaq Smart ARRAY RAID controllers
cac* at eisa?
scsibus* at cac?
-#ciss* at pci? # Compaq Smart ARRAY 5* Controllers
-#scsibus* at ciss?
+ciss* at pci? # Compaq Smart ARRAYa [56]* Controllers
+scsibus* at ciss?
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
scsibus* at iha?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel