summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-19 05:32:58 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-19 05:32:58 +0000
commitdfd623fdb87604278ec5f8086acc235228f6e588 (patch)
tree28682c454fe052a6c63101e831a62b812c8f37a2 /sys/arch/amd64
parent11de3c42f3fb7a316bbda1ae1baa1c959d707e44 (diff)
add qla and qle everywhere we currently have isp, commented out except for
qle in GENERIC on i386, amd64 and sparc64, where it's reasonably well tested and likely to be useful. requested by deraadt@ and kettenis@, ok dlg@
Diffstat (limited to 'sys/arch/amd64')
-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 0a1bf363270..0c945efed1a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.358 2014/01/22 05:35:17 jcs Exp $
+# $OpenBSD: GENERIC,v 1.359 2014/02/19 05:32:57 jmatthew Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -356,6 +356,8 @@ ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
ips* at pci? # IBM ServeRAID controllers
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla* at pci? # QLogic 2[123]xx FibreChannel
+qle* at pci? # QLogic 2[45]xx FibreChannel
aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI
#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI
siop* at pci? # NCR 538XX SCSI controllers
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 2628c89545c..03c0db25410 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.134 2014/01/20 21:57:01 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.135 2014/02/19 05:32:57 jmatthew Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -182,6 +182,8 @@ twe* at pci? # 3ware Escalade RAID controllers
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
ips* at pci? # IBM ServeRAID controllers
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla* at pci? # Qlogic ISP 2[123]xx SCSI/FibreChannel
+#qle* at pci? # Qlogic ISP 2[45]xx SCSI/FibreChannel
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
siop* at pci? # NCR 538XX SCSI controllers(new)
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI