diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-04-05 16:34:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-04-05 16:34:11 +0000 |
| commit | 723036786b137a0daa94e7096a6fc2d95abb9706 (patch) | |
| tree | b32480a9acba0902841771c3689a1e88f0bafaef /sys/arch/amd64 | |
| parent | 7c196b0fedc95afdbbb3d2bf2e65e5a93f6e0e9e (diff) | |
enable hds, and give up on isp
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 0195eb3fd05..173041d2e79 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.366 2014/03/28 02:42:18 dlg Exp $ +# $OpenBSD: GENERIC,v 1.367 2014/04/05 16:34:10 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -360,7 +360,6 @@ mfii* at pci? # LSI MegaRAID SAS Fusion controllers 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 qlw* at pci? # QLogic ISP SCSI qla* at pci? # QLogic ISP 2[123]xx FibreChannel qle* at pci? # QLogic ISP 2[45]xx FibreChannel @@ -384,7 +383,7 @@ uk* at scsibus? # unknown SCSI mpath0 at root #emc* at scsibus? -#hds* at scsibus? +hds* at scsibus? rdac* at scsibus? sym* at scsibus? diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index 109174572f0..7c79c5184c5 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.60 2013/11/15 19:42:20 sasano Exp $ +# $OpenBSD: RAMDISK,v 1.61 2014/04/05 16:34:10 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -143,7 +143,6 @@ mfi* at pci? # LSI MegaRAID SAS controllers #ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers #twe* at pci? # 3ware Escalade RAID controllers #iha* at pci? # Initio Ultra/UltraWide SCSI controllers -#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI #siop* at pci? # NCR 538XX SCSI controllers(new) #adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 19e3b9a067d..27bf1816bad 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.138 2014/03/27 20:38:16 brad Exp $ +# $OpenBSD: RAMDISK_CD,v 1.139 2014/04/05 16:34:10 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -183,7 +183,6 @@ ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers 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 qlw* at pci? # QLogic ISP SCSI qla* at pci? # QLogic ISP 2[123]xx FibreChannel qle* at pci? # QLogic ISP 2[45]xx FibreChannel |