diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-25 12:51:11 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-25 12:51:11 +0800 |
| commit | e0ed8f9615984df78cd5443727e7657983a6f6b0 (patch) | |
| tree | 3df10cef101c1d88213433c46f71014f606e4fdd /drivers/mmc/core | |
| parent | 8ae3cff80f21bb078fcef63520a98f2d73e7359a (diff) | |
| parent | 781e4301e0c4d7a86a198c867164c13ad727837e (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.1.0' into imx_3.0.35_android
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 8c1d5b2502c2..013029492951 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -840,7 +840,7 @@ static ssize_t mmc_boot_info_show(struct device *dev, "Supports high speed timing during boot" : "Does not support high speed timing during boot", - card->ext_csd.boot_size * 128, + card->ext_csd.boot_size >> 10, card->ext_csd.boot_config, !!(card->ext_csd.boot_config & 0x40), |