Merge branch 'master' into for-linus

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h
index da0039c9285e..ff2b0f74f6f4 100644
--- a/drivers/mmc/host/msm_sdcc.h
+++ b/drivers/mmc/host/msm_sdcc.h
@@ -225,7 +225,7 @@ struct msmsdcc_host {
 
         u32                     pwr;
         u32                     saved_irq0mask; /* MMCIMASK0 reg value */
-        struct mmc_platform_data *plat;
+        struct msm_mmc_platform_data *plat;
 
         struct timer_list       timer;
         unsigned int            oldstat;
@@ -235,10 +235,6 @@ struct msmsdcc_host {
         int                     cmdpoll;
         struct msmsdcc_stats    stats;
 
-#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
-        struct work_struct      resume_task;
-#endif
-
         /* Command parameters */
         unsigned int            cmd_timeout;
         unsigned int            cmd_pio_irqmask;