Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[oweals/u-boot.git] / cpu / pxa / mmc.c

diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c
index c57d0d5c32c1ddc24be6fce0403e53d62cfd83b0..d76e0cdfe3b6cdbc5e956300e10f9a0ea9efaae4 100644 (file)
--- a/cpu/pxa/mmc.c
+++ b/cpu/pxa/mmc.c
@@ -363,7 +363,7 @@ mmc_write(uchar *src, ulong dst, int size)
 
 ulong
 /****************************************************/
-mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst)
+mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
 /****************************************************/
 {
        int mmc_block_size = MMC_BLOCK_SIZE;
@@ -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;