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@

23 files changed, 68 insertions, 23 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 012034b4019..cea0b6d639f 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.236 2013/12/22 18:53:14 miod Exp $
+#	$OpenBSD: GENERIC,v 1.237 2014/02/19 05:32:56 jmatthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -196,6 +196,8 @@ cy*	at pci?				# PCI cyclom card
 # PCI SCSI devices
 ahc*	at pci?				# Adaptec 2940 SCSI controllers
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?				# Qlogic ISP 2[123]xx FibreChannel
+#qle*	at pci?				# Qlogic ISP 2[45]xx FibreChannel
 siop*	at pci?				# NCR 53c8xx SCSI
 pcscp*	at pci?				# AMD 53c974 PCscsi-PCI SCSI
 twe*	at pci?				# 3ware Escalade RAID controllers
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 87444911d64..96673fe37d0 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.72 2013/10/29 22:33:10 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.73 2014/02/19 05:32:56 jmatthew Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -91,6 +91,8 @@ tga*	at pci?				# DEC ZLXp-E[123] graphics
 pcn*	at pci?				# AMD PCnet-PCI Ethernet
 
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?				# Qlogic ISP 2[123]xx FibreChannel
+#qle*	at pci?				# Qlogic ISP 2[45]xx FibreChannel
 option ISP_NOFIRMWARE
 
 # Media Independent Interface (mii) drivers
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 980cd73609b..4fc1d96f288 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.39 2013/10/29 22:33:10 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.40 2014/02/19 05:32:56 jmatthew Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -84,6 +84,8 @@ tga*	at pci?				# DEC ZLXp-E[123] graphics
 #pcn*	at pci?				# AMD PCnet-PCI Ethernet
 
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?				# Qlogic ISP 2[123]xx FibreChannel
+#qle*	at pci?				# Qlogic ISP 2[45]xx FibreChannel
 option ISP_NOFIRMWARE
 
 # Media Independent Interface (mii) drivers
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 7ee9fb10df4..0fc58789c29 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.90 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.91 2014/02/19 05:32:56 jmatthew Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -160,6 +160,8 @@ cy*	at pci?				# PCI cyclom card
 # PCI SCSI devices
 ahc*	at pci?				# Adaptec 2940 SCSI 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
 siop*	at pci?				# NCR 53c8xx SCSI
 pcscp*	at pci?				# AMD 53c974 PCscsi-PCI SCSI
 twe*	at pci?				# 3ware Escalade RAID controllers
diff --git a/sys/arch/alpha/conf/RAMDISKC b/sys/arch/alpha/conf/RAMDISKC
index 588dead185c..eacd6eccd5e 100644
--- a/sys/arch/alpha/conf/RAMDISKC
+++ b/sys/arch/alpha/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.3 2013/10/29 22:33:10 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.4 2014/02/19 05:32:56 jmatthew Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
 
@@ -77,6 +77,8 @@ tga*	at pci?				# DEC ZLXp-E[123] graphics
 #pcn*	at pci?				# AMD PCnet-PCI Ethernet
 
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?				# Qlogic ISP 2[123]xx FibreChannel
+#qle*	at pci?				# Qlogic ISP 2[45]xx FibreChannel
 option ISP_NOFIRMWARE
 
 # Media Independent Interface (mii) drivers
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
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index c6b4876a01e..690f56ba89a 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.154 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: GENERIC,v 1.155 2014/02/19 05:32:57 jmatthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -254,6 +254,8 @@ mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
 #bha*	at eisa?
 #bha*	at pci?
 isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?			# Qlogic ISP 2[123]xx FibreChannel
+#qle*	at pci?			# Qlogic ISP 2[45]xx FibreChannel
 
 siop*	at mainbus? irq 3	# NCR 53C720 (Fast-Wide HVD)
 siop*	at phantomas? irq 3
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e90ae2416de..b234030e60e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.766 2014/01/22 05:35:17 jcs Exp $
+#	$OpenBSD: GENERIC,v 1.767 2014/02/19 05:32:57 jmatthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -457,6 +457,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 ISP 2[123]xx FibreChannel
+qle*	at pci?			# Qlogic ISP 2[45]xx FibreChannel
 #qli*	at pci?			# Qlogic 4010 & 4022 iSCSI
 aic0	at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
 aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 59a8b412a7f..13fc7f4136d 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.209 2014/02/17 19:44:32 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.210 2014/02/19 05:32:57 jmatthew Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -217,6 +217,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
 aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
 aic*	at isapnp?
 aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index aa78bfd2ac5..9064b5d1f93 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.228 2013/11/15 19:42:20 sasano Exp $g
+#	$OpenBSD: GENERIC,v 1.229 2014/02/19 05:32:57 jmatthew Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -62,6 +62,8 @@ ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
 #ami*		at pci?
 pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
 isp*		at pci?		# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*		at pci?		# Qlogic ISP 2[123]xx FibreChannel
+#qle*		at pci?		# Qlogic ISP 2[45]xx FibreChannel
 mpi*		at pci?		# LSI Logic MPT-Fusion Message Passing Interface
 arc*		at pci?		# Areca RAID Controllers
 pciide*		at pci?
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 670f3709f90..3b3a17103b4 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.99 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: RAMDISK,v 1.100 2014/02/19 05:32:57 jmatthew Exp $
 #
 # PPC GENERIC config file
 #
@@ -57,6 +57,8 @@ ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
 #bha*		at pci?		# BusLogic 9xx SCSI
 pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
 isp*		at pci?		# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*		at pci?		# Qlogic ISP 2[123]xx FibreChannel
+#qle*		at pci?		# Qlogic ISP 2[45]xx FibreChannel
 mpi*		at pci?		# LSI Logic MPT-Fusion Message Passing Interface
 arc*		at pci?		# Areca RAID Controllers
 pciide*		at pci?
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index 42794f6d202..2f51873ed48 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP27,v 1.49 2014/02/08 09:35:07 miod Exp $
+#	$OpenBSD: GENERIC-IP27,v 1.50 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 #
@@ -78,6 +78,8 @@ iockbc*		at iof?
 #### SCSI
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 1761eccb0cb..bb505230f62 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP30,v 1.42 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: GENERIC-IP30,v 1.43 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 #
@@ -69,6 +69,8 @@ owserial*	at onewire?
 #### SCSI
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index e9b2b331d59..c8b870897e3 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP32,v 1.33 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: GENERIC-IP32,v 1.34 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 #
@@ -61,6 +61,8 @@ pci*		at macepcibr?
 #### SCSI
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 4f9c65de9ac..b4aa0d811bb 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.29 2014/02/08 09:35:07 miod Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.30 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -86,6 +86,8 @@ iockbc*		at iof?
 #### SCSI controllers
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 78442371dc6..2bc50e3aca0 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.24 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.25 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -78,6 +78,8 @@ owserial*	at onewire?
 #### SCSI controllers
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 85f54838ad2..872eae441b8 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP32,v 1.20 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: RAMDISK-IP32,v 1.21 2014/02/19 05:32:57 jmatthew Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 
@@ -68,6 +68,8 @@ pci*		at macepcibr?	# PCI is on pci bridge
 #### SCSI controllers
 ahc*		at pci?
 isp*		at pci?
+#qla*		at pci?
+#qle*		at pci?
 mpi*		at pci?
 siop*		at pci?
 
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 6fc6547201d..f4ff819e582 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.104 2013/06/04 21:05:54 miod Exp $
+#	$OpenBSD: GENERIC,v 1.105 2014/02/19 05:32:57 jmatthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -151,6 +151,7 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4e, sun4m
 isp*	at sbus?
+#qla*	at sbus?
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 4d96c35899f..70600baa10a 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.65 2011/11/08 12:53:58 deraadt Exp $
+#	$OpenBSD: SUN4C,v 1.66 2014/02/19 05:32:57 jmatthew Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -95,6 +95,7 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4m
 isp*	at sbus?
+#qla*	at sbus?
 
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
 le0	at sbus0					# sun4c on-board
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 426b4865f8f..0c59a44d179 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.81 2011/11/08 12:53:58 deraadt Exp $
+#	$OpenBSD: SUN4M,v 1.82 2014/02/19 05:32:57 jmatthew Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -111,6 +111,7 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4m
 isp*	at sbus?
+#qla*	at sbus?
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index b7a7052143d..fc83b2186ff 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.274 2013/11/15 19:42:20 sasano Exp $
+#	$OpenBSD: GENERIC,v 1.275 2014/02/19 05:32:57 jmatthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -113,6 +113,8 @@ malo*	at pcmcia?		# Marvell 88W8385
 ahc*	at pci?			# Adaptec 2940 SCSI controllers
 siop*	at pci?			# NCR 538XX SCSI controllers
 isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
+#qla*	at pci?			# Qlogic ISP 2[123]xx FibreChannel
+qle*	at pci?			# Qlogic ISP 2[45]xx FibreChannel
 pcscp*	at pci?			# AMD 53c974 PCscsi-PCI SCSI
 mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
 mpii*	at pci?			# LSI Message Passing Interface II
@@ -396,6 +398,7 @@ dma*	at sbus?				# SBus
 esp*	at dma?					# SBus
 esp*	at sbus?
 isp*	at sbus?
+#qla*	at sbus?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index ce21e01f36c..bf71b98ace4 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.104 2013/08/20 09:06:02 dlg Exp $
+#	$OpenBSD: RAMDISK,v 1.105 2014/02/19 05:32:57 jmatthew Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -169,11 +169,14 @@ dma*	at sbus?		# SBus
 esp*	at dma?			# SBus
 esp*	at sbus?
 isp*	at sbus?
+#qla*	at sbus?
 softraid0	at root		# Software RAID
 
 ahc*	at pci?
 siop*	at pci?
 isp*	at pci?
+#qla*	at pci?
+#qle*	at pci?
 mpi*	at pci?
 mpii*	at pci?
 sili*	at pci?