Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Mon, 14 Mar 2016 23:21:44 +0000 (19:21 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 14 Mar 2016 23:21:44 +0000 (19:21 -0400)
1  2 
cmd/disk.c
common/spl/spl_mmc.c
include/common.h
include/configs/UCP1020.h
include/configs/sandbox.h
include/spl.h

diff --cc cmd/disk.c
@@@ -20,9 -20,9 +20,9 @@@ int common_diskboot(cmd_tbl_t *cmdtp, c
  #if defined(CONFIG_IMAGE_FORMAT_LEGACY)
        image_header_t *hdr;
  #endif
-       block_dev_desc_t *dev_desc;
+       struct blk_desc *dev_desc;
  
 -#if defined(CONFIG_FIT)
 +#if CONFIG_IS_ENABLED(FIT)
        const void *fit_hdr = NULL;
  #endif
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc include/spl.h
Simple merge