From owner-freebsd-hackers@FreeBSD.ORG  Wed Oct 20 00:45:10 2010
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D64C1065674;
	Wed, 20 Oct 2010 00:45:10 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id D2FE38FC12;
	Wed, 20 Oct 2010 00:45:09 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o9K0dfiM017875;
	Tue, 19 Oct 2010 18:39:41 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Tue, 19 Oct 2010 18:39:41 -0600 (MDT)
Message-Id: <20101019.183941.41645397.imp@bsdimp.com>
To: jhb@FreeBSD.org
From: Warner Losh <imp@bsdimp.com>
In-Reply-To: <201010191522.21357.jhb@freebsd.org>
References: <201010191103.50986.jhb@freebsd.org>
	<20101019191446.GA44841@freebsd.org>
	<201010191522.21357.jhb@freebsd.org>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: arundel@FreeBSD.org, mj@feral.com, freebsd-hackers@FreeBSD.org
Subject: Re: SCSI_DELAY cleanup
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Oct 2010 00:45:10 -0000

opt_scsi.h isn't needed by aha or ahb either, so it can be deleted
entirely from their module makefiles:

Index: aha/Makefile
===================================================================
--- aha/Makefile	(revision 214058)
+++ aha/Makefile	(working copy)
@@ -4,11 +4,6 @@
 
 KMOD=	aha
 SRCS=	aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \
-	opt_scsi.h isa_if.h
+	isa_if.h
 
-.if !defined(KERNBUILDDIR)
-opt_scsi.h:
-	echo "#define SCSI_DELAY 15000" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
Index: ahb/Makefile
===================================================================
--- ahb/Makefile	(revision 214058)
+++ ahb/Makefile	(working copy)
@@ -3,11 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/ahb
 
 KMOD=	ahb
-SRCS=	ahb.c opt_cam.h device_if.h bus_if.h eisa_if.h opt_scsi.h
+SRCS=	ahb.c opt_cam.h device_if.h bus_if.h eisa_if.h
 
-.if !defined(KERNBUILDDIR)
-opt_scsi.h:
-	echo "#define SCSI_DELAY 15000" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>