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 ac454fdd4d30b2006fe151a5fad598c7560c76a8..c5d411174db0fb282d019a391c94f723513a84ae 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -131,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;