PERFORCE change 96418 for review

[Scott Long]

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

Change 96418 by scottl at 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 $
  */
 
 /*