summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-04-05 16:34:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-04-05 16:34:11 +0000
commit723036786b137a0daa94e7096a6fc2d95abb9706 (patch)
treeb32480a9acba0902841771c3689a1e88f0bafaef /sys
parent7c196b0fedc95afdbbb3d2bf2e65e5a93f6e0e9e (diff)
enable hds, and give up on isp
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/RAMDISK3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/RAMDISK3
-rw-r--r--sys/arch/i386/conf/RAMDISKB3
-rw-r--r--sys/arch/i386/conf/RAMDISKC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
8 files changed, 10 insertions, 18 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
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f6eec4e881c..56639839574 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.772 2014/03/28 02:42:18 dlg Exp $
+# $OpenBSD: GENERIC,v 1.773 2014/04/05 16:33:54 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -460,7 +460,6 @@ cac* at eisa?
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
@@ -493,7 +492,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/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index d87c8ced2a7..bd4507823d5 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.183 2013/10/28 12:33:32 mpi Exp $
+# $OpenBSD: RAMDISK,v 1.184 2014/04/05 16:33:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -137,7 +137,6 @@ com* at isapnp?
#ahc* at pci? # Adaptec 2940 SCSI controllers
#ahd* at pci? # Adaptec 79?? SCSI controllers
#twe* at pcu? # 3ware Escalade RAID controllers
-#isp* at pci? # Qlogic ISP [12]0x0 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/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 32858956200..92e4ea39fad 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.126 2013/10/28 12:33:32 mpi Exp $
+# $OpenBSD: RAMDISKB,v 1.127 2014/04/05 16:33:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -144,7 +144,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
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
#aic* at isapnp?
#siop* at pci? # NCR 538XX SCSI controllers(new)
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 00ec9374f6e..d577c545f8e 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.108 2013/11/15 19:42:20 sasano Exp $
+# $OpenBSD: RAMDISKC,v 1.109 2014/04/05 16:33:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -172,7 +172,6 @@ com2 at isa? port 0x3e8 irq 5
#ahc* at pci? # Adaptec 2940 SCSI controllers
#gdt* at pci? # ICP Vortex GDT RAID controllers
#twe* at pci? # 3ware Escalade RAID controllers
-#isp* at pci? # Qlogic ISP [12]0x0 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/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 09ea6022694..03533cee62c 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.213 2014/03/27 20:38:16 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.214 2014/04/05 16:33:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -218,7 +218,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 04:32:41 +0000