summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-03-28 08:24:01 -0400
committerTom Rini <trini@ti.com>2014-03-28 08:24:01 -0400
commit82b9547387389cc4147596cb45609bf29d3fdbdb (patch)
tree76e2566eaa67e09e7c2262bdc2354d81b8523ecd /common
parent81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b (diff)
parenteea4e6fe82fef9975e0153644935b89882890450 (diff)
downloadu-boot-imx-82b9547387389cc4147596cb45609bf29d3fdbdb.zip
u-boot-imx-82b9547387389cc4147596cb45609bf29d3fdbdb.tar.gz
u-boot-imx-82b9547387389cc4147596cb45609bf29d3fdbdb.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'common')
-rw-r--r--common/cmd_mmc.c2
-rw-r--r--common/cmd_mmc_spi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 2d51927..bd1edc8 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -79,7 +79,7 @@ enum mmc_state {
};
static void print_mmcinfo(struct mmc *mmc)
{
- printf("Device: %s\n", mmc->name);
+ printf("Device: %s\n", mmc->cfg->name);
printf("Manufacturer ID: %x\n", mmc->cid[0] >> 24);
printf("OEM: %x\n", (mmc->cid[0] >> 8) & 0xffff);
printf("Name: %c%c%c%c%c \n", mmc->cid[0] & 0xff,
diff --git a/common/cmd_mmc_spi.c b/common/cmd_mmc_spi.c
index 98cd788..a2138b8 100644
--- a/common/cmd_mmc_spi.c
+++ b/common/cmd_mmc_spi.c
@@ -72,7 +72,7 @@ static int do_mmc_spi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf("Failed to create MMC Device\n");
return 1;
}
- printf("%s: %d at %u:%u hz %u mode %u\n", mmc->name, mmc->block_dev.dev,
+ printf("%s: %d at %u:%u hz %u mode %u\n", mmc->cfg->name, mmc->block_dev.dev,
bus, cs, speed, mode);
mmc_init(mmc);
return 0;