bha depends on the deleted aha.h, so it will follow it into the attic

5 files changed, 5 insertions, 17 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ce4fd81172e..e7f5d98e15e 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.431 2016/09/03 16:18:21 tedu Exp $
+#	$OpenBSD: GENERIC,v 1.432 2016/09/04 10:22:05 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -368,7 +368,6 @@ lpt*	at puc?
 efifb0		at mainbus?		# EFI Framebuffer
 wsdisplay0	at efifb? console 1
 
-#bha*	at pci?				# BusLogic [57]4X SCSI controllers
 ahc*	at pci?				# Adaptec 2940 SCSI controllers
 jmb*	at pci?				# JMicron JMB36x controllers
 ahci*	at jmb? flags 0x0000		# flags 0x0001 to force SATA 1 (1.5Gb/s)
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index b1653d63d46..8d41f88a25f 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.172 2016/09/03 21:37:29 tedu Exp $
+#	$OpenBSD: GENERIC,v 1.173 2016/09/04 10:22:06 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -243,9 +243,6 @@ pms*	at gsckbc?		# PS/2 mouse
 #ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci?			# Adaptec 2940 SCSI controllers
 mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
-#option	BHADEBUG
-#bha*	at eisa?
-#bha*	at pci?
 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 e5aecd1e01d..a0cddb1daa1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.821 2016/09/03 21:37:29 tedu Exp $
+#	$OpenBSD: GENERIC,v 1.822 2016/09/04 10:22:06 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -423,11 +423,6 @@ lpt1	at isa? port 0x278
 lpt2	at isa? port 0x3bc
 lpt*	at puc?
 
-bha0	at isa? port 0x330		# BusLogic [57]4X SCSI controllers
-bha1	at isa? disable port 0x334	# BusLogic [57]4X SCSI controllers
-bha2	at isa? disable
-bha*	at pci?
-#bha*	at eisa?		# XXX eisa still runs in isa-compat
 #ahc0	at isa?			# Adaptec 284x SCSI controllers
 ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 7a965889d9f..e7798c57a9f 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.230 2016/09/03 21:37:29 tedu Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.231 2016/09/04 10:22:06 tedu Exp $
 
 machine		i386
 maxusers	4
@@ -127,8 +127,6 @@ com2		at isa? port 0x3e8 irq 5
 com*		at pcmcia?			# PCMCIA modem cards
 com*		at isapnp?
 
-bha0		at isa? port 0x330	# BusLogic [57]4X SCSI controllers
-bha*		at pci?
 ahc*		at eisa?		# Adaptec 274x, aic7770 SCSI controllers
 ahc*		at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 jmb*		at pci?			# JMicron JMB36x controllers
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 4abcd572f70..a52fce93833 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.258 2016/06/28 04:41:37 jmatthew Exp $g
+#	$OpenBSD: GENERIC,v 1.259 2016/09/04 10:22:06 tedu Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -58,7 +58,6 @@ vgafb0		at pci?		# PCI VGA graphics
 #ne*		at pci?		# NE2000-compatible Ethernet
 #adv*		at pci?		# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
-#bha*		at pci?		# BusLogic 9xx SCSI
 #ami*		at pci?
 pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
 qlw*		at pci?		# QLogic ISP SCSI