Merge branch 'master'; commit 'v2.6.38-rc7' into next

[~andy/linux] / drivers / scsi / sym53c8xx_2 / sym_fw.h

diff --git a/drivers/scsi/sym53c8xx_2/sym_fw.h b/drivers/scsi/sym53c8xx_2/sym_fw.h
index 43f6810a4045191f17aa6ce4374ac696517b7de4..ae7e0f9e93fc2be54b0856e204438be7f42b7647 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_fw.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw.h
@@ -92,9 +92,6 @@ struct sym_fwa_ofs {
 };
 struct sym_fwb_ofs {
        SYM_GEN_FW_B(u_short)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-       SYM_GEN_B(u_short, data_io)
-#endif
        SYM_GEN_B(u_short, start64)
        SYM_GEN_B(u_short, pm_handle)
 };
@@ -111,9 +108,6 @@ struct sym_fwa_ba {
 };
 struct sym_fwb_ba {
        SYM_GEN_FW_B(u32)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-       SYM_GEN_B(u32, data_io)
-#endif
        SYM_GEN_B(u32, start64);
        SYM_GEN_B(u32, pm_handle);
 };
@@ -149,7 +143,7 @@ struct sym_fw {
                *z_ofs;         /* Useful offsets in script Z   */
        /* Setup and patch methods for this firmware */
        void    (*setup)(struct sym_hcb *, struct sym_fw *);
-       void    (*patch)(struct sym_hcb *);
+       void    (*patch)(struct Scsi_Host *);
 };
 
 /*