From: Tom Rini <trini@konsulko.com>
Date: Mon, 14 Mar 2016 23:21:44 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-favicon.png?a=commitdiff_plain;h=88033d737d9f46e7eebda6a8f9770957eb9aae9c;p=u-boot.git

Merge git://git.denx.de/u-boot-dm
---

88033d737d9f46e7eebda6a8f9770957eb9aae9c
diff --cc cmd/disk.c
index 106f2d1a3b,e0219f810e..2fd1717e6a
--- a/cmd/disk.c
+++ b/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