[LV-k25-commit] kernel-2.5/drivers/scsi NCR5380.c,1.8,1.9 qlogicfc.h,1.1.1.8,NONE qlogicisp.h,1.1.1.6,NONE scsi_obsolete.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26174/drivers/scsi

Modified Files:
	NCR5380.c 
Removed Files:
	qlogicfc.h qlogicisp.h scsi_obsolete.h 
Log Message:
Merge with 2.6.12


--- qlogicfc.h DELETED ---

--- scsi_obsolete.h DELETED ---

--- qlogicisp.h DELETED ---

Index: NCR5380.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NCR5380.c	21 Mar 2005 23:37:10 -0000	1.8
+++ NCR5380.c	24 Jul 2005 21:43:50 -0000	1.9
@@ -28,11 +28,11 @@
 
 /*
  * $Log$
- * Revision 1.8  2005/03/21 23:37:10  kenn
- * Merge with 2.6.10
+ * Revision 1.9  2005/07/24 21:43:50  kenn
+ * Merge with 2.6.12
  *
- * Revision 1.1.1.22  2005/03/21 20:23:56  kenn
- * Import of pristine Linus 2.6.10 tree
+ * Revision 1.1.1.23  2005/07/24 20:16:12  kenn
+ * Import of pristine Linus 2.6.12 tree
  *
 
  * Revision 1.10 1998/9/2	Alan Cox
@@ -92,6 +92,7 @@
  * 5.  Test linked command handling code after Eric is ready with 
  *      the high level code.
  */
+#include <scsi/scsi_dbg.h>
 
 #if (NDEBUG & NDEBUG_LISTS)
 #define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }
@@ -2379,7 +2380,7 @@
  * 3..length+1  arguments
  *
  * Start the extended message buffer with the EXTENDED_MESSAGE
- * byte, since print_msg() wants the whole thing.  
+ * byte, since scsi_print_msg() wants the whole thing.  
  */
 					extended_msg[0] = EXTENDED_MESSAGE;
 					/* Accept first byte by clearing ACK */
@@ -2426,7 +2427,7 @@
 				default:
 					if (!tmp) {
 						printk("scsi%d: rejecting message ", instance->host_no);
-						print_msg(extended_msg);
+						scsi_print_msg(extended_msg);
 						printk("\n");
 					} else if (tmp != EXTENDED_MESSAGE)
 						printk("scsi%d: rejecting unknown message %02x from target %d, lun %d\n", instance->host_no, tmp, cmd->device->id, cmd->device->lun);
@@ -2560,7 +2561,7 @@
 
 	if (!(msg[0] & 0x80)) {
 		printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no);
-		print_msg(msg);
+		scsi_print_msg(msg);
 		abort = 1;
 	} else {
 		/* Accept message by clearing ACK */
@@ -2685,7 +2686,7 @@
 	Scsi_Cmnd *tmp, **prev;
 	
 	printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no);
-	print_Scsi_Cmnd(cmd);
+	scsi_print_command(cmd);
 
 	NCR5380_print_status(instance);