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

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

diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index b24ef2e..ae47612 100644 (file)
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
@@ -85,7 +85,6 @@ struct fastlane_dma_registers {
 
 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 inline void dma_clear(struct NCR_ESP *esp);
 static void dma_dump_state(struct NCR_ESP *esp);
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length);
 static void dma_init_write(struct NCR_ESP *esp, __u32 vaddr, int length);
@@ -110,6 +109,21 @@ static volatile unsigned char cmd_buffer[16];
                                 * via PIO.
                                 */
 
+static inline void dma_clear(struct NCR_ESP *esp)
+{
+       struct fastlane_dma_registers *dregs =
+               (struct fastlane_dma_registers *) (esp->dregs);
+       unsigned long *t;
+
+       ctrl_data = (ctrl_data & FASTLANE_DMA_MASK);
+       dregs->ctrl_reg = ctrl_data;
+
+       t = (unsigned long *)(esp->edev);
+
+       dregs->clear_strobe = 0;
+       *t = 0 ;
+}
+
 /***************************************************************** Detection */
 int __init fastlane_esp_detect(Scsi_Host_Template *tpnt)
 {
@@ -297,21 +311,6 @@ static void dma_init_write(struct NCR_ESP *esp, __u32 addr, int length)
        dregs->ctrl_reg = ctrl_data;
 }
 
-static inline void dma_clear(struct NCR_ESP *esp)
-{
-       struct fastlane_dma_registers *dregs = 
-               (struct fastlane_dma_registers *) (esp->dregs);
-       unsigned long *t;
-
-       ctrl_data = (ctrl_data & FASTLANE_DMA_MASK);
-       dregs->ctrl_reg = ctrl_data;
-
-       t = (unsigned long *)(esp->edev);
-
-       dregs->clear_strobe = 0;
-       *t = 0 ;
-}
-
 
 static void dma_ints_off(struct NCR_ESP *esp)
 {