Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6-block.git] / include / linux / mmc / host.h

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 357e80efcde0ca1c7be8d4891a4dbb029a440c3d..e326ae2882a0c5155045a594186a5ded1768444f 100644 (file)
--- 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 */
 
@@ -359,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;
 };