diff options
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKB | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKBIG | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKC | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 8 |
8 files changed, 28 insertions, 25 deletions
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 0cf698b6662..26e0cce3129 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.74 2014/03/08 18:28:23 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.75 2014/03/14 05:38:31 jmatthew Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -92,9 +92,10 @@ pcn* at pci? # AMD PCnet-PCI Ethernet 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 +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +qle* at pci? # QLogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE +option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers amphy* at mii? # AMD 79C873 PHYs diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 4fc1d96f288..be6edb6beb3 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.40 2014/02/19 05:32:56 jmatthew Exp $ +# $OpenBSD: RAMDISKB,v 1.41 2014/03/14 05:38:31 jmatthew Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -84,9 +84,10 @@ 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 +qla* at pci? # Qlogic ISP 2[123]xx FibreChannel +qle* at pci? # Qlogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE +option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers amphy* at mii? # AMD 79C873 PHYs diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 0fc58789c29..c2bde5610e0 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.91 2014/02/19 05:32:56 jmatthew Exp $ +# $OpenBSD: RAMDISKBIG,v 1.92 2014/03/14 05:38:31 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,8 +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 +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 eacd6eccd5e..1c2919f1ef6 100644 --- a/sys/arch/alpha/conf/RAMDISKC +++ b/sys/arch/alpha/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.4 2014/02/19 05:32:56 jmatthew Exp $ +# $OpenBSD: RAMDISKC,v 1.5 2014/03/14 05:38:31 jmatthew Exp $ machine alpha # architecture, used by config; REQUIRED @@ -77,9 +77,10 @@ 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 +qla* at pci? # Qlogic ISP 2[123]xx FibreChannel +qle* at pci? # Qlogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE +option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers #amphy* at mii? # AMD 79C873 PHYs diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 75db699760a..8dea942a380 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.136 2014/03/08 18:28:23 kettenis Exp $ +# $OpenBSD: RAMDISK_CD,v 1.137 2014/03/14 05:38:31 jmatthew Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -183,8 +183,8 @@ iha* at pci? # Initio Ultra/UltraWide SCSI controllers ips* at pci? # IBM ServeRAID controllers 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 +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/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 05c425914bf..ff9ba60accc 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.211 2014/03/08 18:28:24 kettenis Exp $ +# $OpenBSD: RAMDISK_CD,v 1.212 2014/03/14 05:38:31 jmatthew Exp $ machine i386 # architecture, used by config; REQUIRED @@ -218,8 +218,8 @@ twe* at pci? # 3ware Escalade RAID controllers ips* at pci? # IBM ServeRAID controllers 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 +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/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 005a62f8528..cefaff653f3 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.101 2014/03/08 18:28:24 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.102 2014/03/14 05:38:31 jmatthew Exp $ # # PPC GENERIC config file # @@ -58,8 +58,8 @@ ahc* at pci? # Adaptec 294x, aic78x0 SCSI pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI 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 +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/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 0d731e73207..48bcfa17e5c 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.106 2014/03/08 18:28:24 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.107 2014/03/14 05:38:31 jmatthew Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -169,15 +169,15 @@ dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? isp* at sbus? -#qla* at sbus? +qla* at sbus? softraid0 at root # Software RAID ahc* at pci? siop* at pci? isp* at pci? qlw* at pci? -#qla* at pci? -#qle* at pci? +qla* at pci? +qle* at pci? mpi* at pci? mpii* at pci? sili* at pci? |