diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/alpha/conf/GENERIC | 7 | ||||
-rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 7 | ||||
-rw-r--r-- | sys/arch/amd64/conf/GENERIC | 7 | ||||
-rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 7 | ||||
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 9 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 7 | ||||
-rw-r--r-- | sys/arch/macppc/conf/GENERIC | 9 | ||||
-rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 9 | ||||
-rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP27 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP30 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP32 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP30 | 3 | ||||
-rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP32 | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 7 | ||||
-rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 3 |
16 files changed, 53 insertions, 37 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index cb9840989df..4679b2d8f61 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.238 2014/02/22 17:43:16 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.239 2014/03/08 18:28:23 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -196,8 +196,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#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 96673fe37d0..0cf698b6662 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.73 2014/02/19 05:32:56 jmatthew Exp $ +# $OpenBSD: RAMDISK,v 1.74 2014/03/08 18:28:23 kettenis Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -91,8 +91,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#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 413d92e1d79..56163b3e90f 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.360 2014/02/23 09:36:52 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.361 2014/03/08 18:28:23 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -358,8 +358,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#qla* at pci? # QLogic ISP 2[123]xx FibreChannel +qle* at pci? # QLogic ISP 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 03c0db25410..75db699760a 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.135 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.136 2014/03/08 18:28:23 kettenis Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -182,8 +182,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#qla* at pci? # QLogic ISP 2[123]xx FibreChannel +#qle* at pci? # QLogic ISP 2[45]xx 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/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 3aead040cb9..51bae4b2e4d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.768 2014/02/23 09:36:52 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.769 2014/03/08 18:28:23 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -459,9 +459,10 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#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 aic* at isapnp? # isapnp configured aic SCSI controllers diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 13fc7f4136d..05c425914bf 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.210 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.211 2014/03/08 18:28:24 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -217,8 +217,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#qla* at pci? # QLogic ISP 2[123]xx FibreChannel +#qle* at pci? # QLogic ISP 2[45]xx 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 9064b5d1f93..85eba96f4d3 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.229 2014/02/19 05:32:57 jmatthew Exp $g +# $OpenBSD: GENERIC,v 1.230 2014/03/08 18:28:24 kettenis Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -61,9 +61,10 @@ ahc* at pci? # Adaptec 294x, aic78x0 SCSI #bha* at pci? # BusLogic 9xx 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 +isp* at pci? # QLogic ISP [12]0x0 SCSI/FibreChannel +qlw* at pci? # QLogic ISP SCSI +#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 3b3a17103b4..005a62f8528 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.100 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK,v 1.101 2014/03/08 18:28:24 kettenis Exp $ # # PPC GENERIC config file # @@ -56,9 +56,10 @@ vgafb0 at pci? # PCI VGA graphics 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 +isp* at pci? # QLogic ISP [12]0x0 SCSI/FibreChannel +qlw* at pci? # QLogic ISP SCSI +#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 2f51873ed48..dd7119f4739 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.50 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: GENERIC-IP27,v 1.51 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -78,6 +78,7 @@ iockbc* at iof? #### SCSI ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index bb505230f62..fa8c133c6c2 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.43 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: GENERIC-IP30,v 1.44 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -69,6 +69,7 @@ owserial* at onewire? #### SCSI ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index c8b870897e3..b048d8b4797 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.34 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: GENERIC-IP32,v 1.35 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -61,6 +61,7 @@ pci* at macepcibr? #### SCSI ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index b4aa0d811bb..c19083bab2a 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.30 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.31 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -86,6 +86,7 @@ iockbc* at iof? #### SCSI controllers ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 2bc50e3aca0..18cfe5e2d0b 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.25 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.26 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -78,6 +78,7 @@ owserial* at onewire? #### SCSI controllers ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 872eae441b8..6cf7bf6b79f 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.21 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.22 2014/03/08 18:28:24 kettenis Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -68,6 +68,7 @@ pci* at macepcibr? # PCI is on pci bridge #### SCSI controllers ahc* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index fc83b2186ff..0c6bc803012 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.275 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: GENERIC,v 1.276 2014/03/08 18:28:24 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -113,8 +113,9 @@ 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 +qlw* at pci? # QLogic ISP SCSI +#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 diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index bf71b98ace4..0d731e73207 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.105 2014/02/19 05:32:57 jmatthew Exp $ +# $OpenBSD: RAMDISK,v 1.106 2014/03/08 18:28:24 kettenis Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -175,6 +175,7 @@ softraid0 at root # Software RAID ahc* at pci? siop* at pci? isp* at pci? +qlw* at pci? #qla* at pci? #qle* at pci? mpi* at pci? |