Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

[mv-sheeva.git] / drivers / block / cciss.h

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 2b07bdacbd1292ff094bc61c69ed62087e139140..c5d411174db0fb282d019a391c94f723513a84ae 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -55,12 +55,6 @@ typedef struct _drive_info_struct
        char device_initialized;     /* indicates whether dev is initialized */
 } drive_info_struct;
 
-struct Cmd_sg_list {
-       SGDescriptor_struct     *sgchain;
-       dma_addr_t              sg_chain_dma;
-       int                     chain_block_size;
-};
-
 struct ctlr_info
 {
        int     ctlr;
@@ -89,7 +83,7 @@ struct ctlr_info
        int     maxsgentries;
        int     chainsize;
        int     max_cmd_sgentries;
-       struct Cmd_sg_list **cmd_sg_list;
+       SGDescriptor_struct **cmd_sg_list;
 
 #      define DOORBELL_INT     0
 #      define PERF_MODE_INT    1
@@ -137,9 +131,7 @@ struct ctlr_info
        /* Disk structures we need to pass back */
        struct gendisk   *gendisk[CISS_MAX_LUN];
 #ifdef CONFIG_CISS_SCSI_TAPE
-       void *scsi_ctlr; /* ptr to structure containing scsi related stuff */
-       /* list of block side commands the scsi error handling sucked up */
-       /* and saved for later processing */
+       struct cciss_scsi_adapter_data_t *scsi_ctlr;
 #endif
        unsigned char alive;
        struct list_head scan_list;