On Tue, Jul 17, 2012 at 03:04:05PM +0530, Girish K S wrote: > > @@ -261,6 +261,14 @@ struct mmc_host { > > #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ > > #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ > > #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11) /* Write-protect signal active high */ > > +#define MMC_CAP_MAX_CURRENT_200_300 (1 << 12) /* Host max current limit is 200mA at 3.0V */ > > +#define MMC_CAP_MAX_CURRENT_400_300 (1 << 13) /* Host max current limit is 400mA at 3.0V */ > > +#define MMC_CAP_MAX_CURRENT_600_300 (1 << 14) /* Host max current limit is 600mA at 3.0V */ > > +#define MMC_CAP_MAX_CURRENT_800_300 (1 << 15) /* Host max current limit is 800mA at 3.0V */ > > +#define MMC_CAP_MAX_CURRENT_200_330 (1 << 16) /* Host max current limit is 200mA at 3.3V */ > > +#define MMC_CAP_MAX_CURRENT_400_330 (1 << 17) /* Host max current limit is 400mA at 3.3V */ > > +#define MMC_CAP_MAX_CURRENT_600_330 (1 << 18) /* Host max current limit is 600mA at 3.3V */ > > +#define MMC_CAP_MAX_CURRENT_800_330 (1 << 19) /* Host max current limit is 800mA at 3.3V */ > sorry for seeing this late. > The macro name should be **_CAP2_***. Thanks for pointing this out, I'll be more careful next time. > This is already merged in chris's mmc-next branch, > Chris, > Is it possible to change the macro name in the mmc-next branch for this patch? Chris, please let me know how you want to deal with this and I'll be glad to do whatever I can to fix this. Sorry for the trouble. -Aaron -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html