Clean up isp(4) from kernel configs with the new drivers already

added. The new drivers match at a higher priority.

9 files changed, 9 insertions, 18 deletions

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 2e9a76799c1..0970b6152bd 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.165 2014/07/12 21:56:56 tedu Exp $
+#	$OpenBSD: GENERIC,v 1.166 2014/09/14 18:59:18 brad Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -243,7 +243,6 @@ mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
 #option	BHADEBUG
 #bha*	at eisa?
 #bha*	at pci?
-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/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 6d35ffe7787..d937733ec69 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.239 2014/08/15 14:06:48 mikeb Exp $g
+#	$OpenBSD: GENERIC,v 1.240 2014/09/14 18:59:18 brad Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -61,7 +61,6 @@ 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
 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/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 425bbbe7bb5..930c0a06ffb 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.105 2014/08/03 17:52:46 stsp Exp $
+#	$OpenBSD: RAMDISK,v 1.106 2014/09/14 18:59:18 brad Exp $
 #
 # PPC GENERIC config file
 #
@@ -56,7 +56,6 @@ 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
 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/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index dda9b82af01..9293408be1f 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP27,v 1.55 2014/08/22 20:03:56 deraadt Exp $
+#	$OpenBSD: GENERIC-IP27,v 1.56 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 #
@@ -77,7 +77,6 @@ iockbc*		at iof?
 
 #### SCSI
 ahc*		at pci?
-isp*		at pci?
 qlw*		at pci?
 qla*		at pci?
 qle*		at pci?
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 9da4bca0728..0051e612e80 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP30,v 1.48 2014/08/22 20:03:56 deraadt Exp $
+#	$OpenBSD: GENERIC-IP30,v 1.49 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 #
@@ -68,7 +68,6 @@ owserial*	at onewire?
 
 #### SCSI
 ahc*		at pci?
-isp*		at pci?
 qlw*		at pci?
 qla*		at pci?
 qle*		at pci?
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index 2c9a80c1f01..88551ffafeb 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP32,v 1.39 2014/08/22 20:03:56 deraadt Exp $
+#	$OpenBSD: GENERIC-IP32,v 1.40 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 #
@@ -60,7 +60,6 @@ pci*		at macepcibr?
 
 #### SCSI
 ahc*		at pci?
-isp*		at pci?
 qlw*		at pci?
 qla*		at pci?
 qle*		at pci?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index bb2d833de37..035e2749c12 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.33 2014/04/07 08:27:24 brad Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.34 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -85,7 +85,6 @@ iockbc*		at iof?
 
 #### SCSI controllers
 ahc*		at pci?
-isp*		at pci?
 qlw*		at pci?
 qla*		at pci?
 qle*		at pci?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index fc9b8f497e9..9e72157dee1 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.28 2014/04/07 08:27:24 brad Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.29 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -77,7 +77,6 @@ owserial*	at onewire?
 
 #### SCSI controllers
 ahc*		at pci?
-isp*		at pci?
 qlw*		at pci?
 qla*		at pci?
 qle*		at pci?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 8b20e699c65..833a7e42517 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP32,v 1.24 2014/04/07 08:27:24 brad Exp $
+#	$OpenBSD: RAMDISK-IP32,v 1.25 2014/09/14 18:59:18 brad Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 
@@ -67,7 +67,6 @@ 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?