Subject: [PATCH] Amiga Oktagon: Scsi_Cmnd -> struct scsi_cmnd

Amiga Oktagon SCSI: Replace Scsi_Cmnd by struct scsi_cmnd

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

---
 drivers/scsi/oktagon_esp.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

--- linux-m68k-2.6.19.orig/drivers/scsi/oktagon_esp.c
+++ linux-m68k-2.6.19/drivers/scsi/oktagon_esp.c
@@ -49,7 +49,7 @@
 
 
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
-static int  dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
+static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
 static void dma_dump_state(struct NCR_ESP *esp);
 static void dma_init_read(struct NCR_ESP *esp, __u32 vaddress, int length);
 static void dma_init_write(struct NCR_ESP *esp, __u32 vaddress, int length);
@@ -64,11 +64,11 @@ static void dma_setup(struct NCR_ESP *es
 static void dma_irq_exit(struct NCR_ESP *esp);
 static void dma_invalidate(struct NCR_ESP *esp);
 
-static void dma_mmu_get_scsi_one(struct NCR_ESP *,Scsi_Cmnd *);
-static void dma_mmu_get_scsi_sgl(struct NCR_ESP *,Scsi_Cmnd *);
-static void dma_mmu_release_scsi_one(struct NCR_ESP *,Scsi_Cmnd *);
-static void dma_mmu_release_scsi_sgl(struct NCR_ESP *,Scsi_Cmnd *);
-static void dma_advance_sg(Scsi_Cmnd *);
+static void dma_mmu_get_scsi_one(struct NCR_ESP *, struct scsi_cmnd *);
+static void dma_mmu_get_scsi_sgl(struct NCR_ESP *, struct scsi_cmnd *);
+static void dma_mmu_release_scsi_one(struct NCR_ESP *, struct scsi_cmnd *);
+static void dma_mmu_release_scsi_sgl(struct NCR_ESP *, struct scsi_cmnd *);
+static void dma_advance_sg(struct scsi_cmnd *);
 static int  oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x);
 
 #ifdef USE_BOTTOM_HALF
@@ -395,7 +395,7 @@ static int dma_bytes_sent(struct NCR_ESP
 	return fifo_count;
 }
 
-static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static int dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
 	unsigned long sz = sp->SCp.this_residual;
 	if(sz > DMA_MAXTRANSFER)
@@ -542,27 +542,27 @@ static void dma_invalidate(struct NCR_ES
  * mmu interface to pass the virtual address, not the physical.
  */
 
-void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+void dma_mmu_get_scsi_one(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
         sp->SCp.ptr =
                 sp->request_buffer;
 }
 
-void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
         sp->SCp.ptr = page_address(sp->SCp.buffer->page)+
 		      sp->SCp.buffer->offset;
 }
 
-void dma_mmu_release_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+void dma_mmu_release_scsi_one(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
 }
 
-void dma_mmu_release_scsi_sgl(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+void dma_mmu_release_scsi_sgl(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
 }
 
-void dma_advance_sg(Scsi_Cmnd *sp)
+void dma_advance_sg(struct scsi_cmnd *sp)
 {
 	sp->SCp.ptr = page_address(sp->SCp.buffer->page)+
 		      sp->SCp.buffer->offset;