diff options
author | Andy Fleming <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
---|---|---|
committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
commit | d4d1e9bee7c45ea8c513d3af697c864107f1c4d1 (patch) | |
tree | 3cd7eba359e6729454f4fac5b96209eb959ecf72 /cpu/pxa/mmc.c | |
parent | 1487adbdcf9594bb2eb686325a6f9540dad1b70a (diff) | |
parent | 27d2b1ed216b457a66c17d38ce5ffdf3c2c32d1e (diff) | |
download | u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.zip u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.gz u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.bz2 |
Merge branch 'denx'
Diffstat (limited to 'cpu/pxa/mmc.c')
-rw-r--r-- | cpu/pxa/mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c index 0fbaa16..d76e0cd 100644 --- a/cpu/pxa/mmc.c +++ b/cpu/pxa/mmc.c @@ -438,11 +438,11 @@ mmc_init(int verbose) /* FIXME fill in the correct size (is set to 32MByte) */ mmc_dev.blksz = 512; mmc_dev.lba = 0x10000; - sprintf(mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x", + sprintf((char*)mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x", cid->id[0], cid->id[1], cid->id[2], cid->sn[0], cid->sn[1], cid->sn[2]); - sprintf(mmc_dev.product,"%s",cid->name); - sprintf(mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev); + sprintf((char*)mmc_dev.product,"%s",cid->name); + sprintf((char*)mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev); mmc_dev.removable = 0; mmc_dev.block_read = mmc_bread; |