2 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 61b2c30c903b..f31725ba49f3 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -17,6 +17,7 @@
 struct mmc_cid {
         unsigned int            manfid;
         char                    prod_name[8];
+        unsigned char           prv;
         unsigned int            serial;
         unsigned short          oemid;
         unsigned short          year;
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index d6f20cc6415e..e326ae2882a0 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -280,6 +280,7 @@ struct mmc_host {
 #define MMC_CAP2_PACKED_WR      (1 << 13)       /* Allow packed write */
 #define MMC_CAP2_PACKED_CMD     (MMC_CAP2_PACKED_RD | \
                                  MMC_CAP2_PACKED_WR)
+#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14)   /* Don't power up before scan */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
@@ -341,9 +342,7 @@ struct mmc_host {
 
         mmc_pm_flag_t           pm_flags;       /* requested pm features */
 
-#ifdef CONFIG_LEDS_TRIGGERS
         struct led_trigger      *led;           /* activity led */
-#endif
 
 #ifdef CONFIG_REGULATOR
         bool                    regulator_enabled; /* regulator state */
@@ -361,6 +360,8 @@ struct mmc_host {
 
         unsigned int            actual_clock;   /* Actual HC clock rate */
 
+        unsigned int            slotno; /* used for sdio acpi binding */
+
         unsigned long           private[0] ____cacheline_aligned;
 };