Merge remote-tracking branch 'regulator/fix/core' into tmp

[~andy/linux] / drivers / scsi / esp_scsi.h

diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h
index 655e0b2240bf497eb9529723beea4c3e2118b542..28e22acf87ea94f9c703086689da850174495573 100644 (file)
--- a/drivers/scsi/esp_scsi.h
+++ b/drivers/scsi/esp_scsi.h
@@ -322,7 +322,6 @@ struct esp_target_data {
        u8                      nego_goal_tags;
 
        struct scsi_target      *starget;
-       int                     starget_ref;
 };
 
 struct esp_event_ent {
@@ -522,7 +521,8 @@ struct esp {
 
        struct completion       *eh_reset;
 
-       struct sbus_dma         *dma;
+       void                    *dma;
+       int                     dmarev;
 };
 
 /* A front-end driver for the ESP chip should do the following in