This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / drivers / scsi / esp.h

diff --git a/drivers/scsi/esp.h b/drivers/scsi/esp.h
index df6d41a..73f7d69 100644 (file)
--- a/drivers/scsi/esp.h
+++ b/drivers/scsi/esp.h
@@ -8,8 +8,6 @@
 #ifndef _SPARC_ESP_H
 #define _SPARC_ESP_H
 
-#include <linux/config.h>
-
 /* For dvma controller register definitions. */
 #include <asm/dma.h>
 
@@ -75,10 +73,12 @@ struct esp_device {
   unsigned disconnect:1;
 };
 
+struct scsi_cmnd;
+
 /* We get one of these for each ESP probed. */
 struct esp {
-       unsigned long           eregs;          /* ESP controller registers */
-       unsigned long           dregs;          /* DMA controller registers */
+       void __iomem            *eregs;         /* ESP controller registers */
+       void __iomem            *dregs;         /* DMA controller registers */
        struct sbus_dma         *dma;           /* DMA controller sw state */
        struct Scsi_Host        *ehost;         /* Backpointer to SCSI Host */
        struct sbus_dev         *sdev;          /* Pointer to SBus entry */
@@ -181,9 +181,9 @@ struct esp {
        int                     bursts;         /* Burst sizes our DVMA supports */
 
        /* Our command queues, only one cmd lives in the current_SC queue. */
-       Scsi_Cmnd               *issue_SC;      /* Commands to be issued */
-       Scsi_Cmnd               *current_SC;    /* Who is currently working the bus */
-       Scsi_Cmnd               *disconnected_SC;/* Commands disconnected from the bus */
+       struct scsi_cmnd        *issue_SC;      /* Commands to be issued */
+       struct scsi_cmnd        *current_SC;    /* Who is currently working the bus */
+       struct scsi_cmnd        *disconnected_SC;/* Commands disconnected from the bus */
 
        /* Message goo */
        u8                      cur_msgout[16];