VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / i60uscsi.c

diff --git a/drivers/scsi/i60uscsi.c b/drivers/scsi/i60uscsi.c
index 03f6862..cfe8d16 100644 (file)
--- a/drivers/scsi/i60uscsi.c
+++ b/drivers/scsi/i60uscsi.c
@@ -81,7 +81,7 @@
 #include <asm/io.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "inia100.h"
 
 #define JIFFIES_TO_MS(t) ((t) * 1000 / HZ)
@@ -621,7 +621,7 @@ int orc_device_reset(ORC_HCS * pHCB, Scsi_Cmnd *SCpnt, unsigned int target)
        pScb->SCB_XferLen = 0;
        pScb->SCB_SGLen = 0;
 
-       pVirEscb->SCB_Srb = 0;
+       pVirEscb->SCB_Srb = NULL;
        pVirEscb->SCB_Srb = SCpnt;
        orc_exec_scb(pHCB, pScb);       /* Start execute SCB            */
        spin_unlock_irqrestore(&(pHCB->BitAllocFlagLock), flags);