Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/drivers/scsi/esp.h b/drivers/scsi/esp.h
index 2957394..73f7d69 100644 (file)
--- a/drivers/scsi/esp.h
+++ b/drivers/scsi/esp.h
@@ -8,22 +8,9 @@
 #ifndef _SPARC_ESP_H
 #define _SPARC_ESP_H
 
-#include <linux/config.h>
-
-/* #include "scsi.h" */
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
-#include <scsi/scsi_tcq.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-
 /* For dvma controller register definitions. */
 #include <asm/dma.h>
 
-#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir))
-
 /* The ESP SCSI controllers have their register sets in three
  * "classes":
  *
@@ -86,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 */