From owner-p4-projects@FreeBSD.ORG  Sun Apr 30 17:07:40 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A7C516A410; Sun, 30 Apr 2006 17:07:40 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 579CA16A40B
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 17:07:40 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 021FA43D72
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 17:07:39 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3UH7cT8043749
	for <perforce@freebsd.org>; Sun, 30 Apr 2006 17:07:38 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3UH7c5C043746
	for perforce@freebsd.org; Sun, 30 Apr 2006 17:07:38 GMT
	(envelope-from scottl@freebsd.org)
Date: Sun, 30 Apr 2006 17:07:38 GMT
Message-Id: <200604301707.k3UH7c5C043746@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96418 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Apr 2006 17:07:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=96418

Change 96418 by scottl@scottl-junior on 2006/04/30 17:06:56

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#5 (text+ko) ====

@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.29 2005/05/29 04:42:16 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.30 2006/04/30 16:44:41 scottl Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/hptmv/osbsd.h,v 1.5 2005/09/07 23:33:26 scottl Exp $
+ * $FreeBSD: src/sys/dev/hptmv/osbsd.h,v 1.6 2006/04/30 16:44:41 scottl Exp $
  */
 #ifndef _OSBSD_H_
 #define _OSBSD_H_

==== //depot/projects/scottl-camlock/src/sys/dev/rr232x/os_bsd.h#2 (text) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/rr232x/os_bsd.h,v 1.1 2006/04/27 20:22:45 scottl Exp $
+ * $FreeBSD: src/sys/dev/rr232x/os_bsd.h,v 1.2 2006/04/30 16:44:41 scottl Exp $
  */
 
 #ifndef _OS_BSD_H
@@ -82,7 +82,6 @@
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_debug.h>
-#include <cam/cam_xpt_periph.h>
 #include <cam/cam_periph.h>
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>

==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/twa/tw_osl_cam.c,v 1.5 2005/11/08 22:51:43 vkashyap Exp $
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_cam.c,v 1.6 2006/04/30 16:46:11 scottl Exp $
  */
 
 /*