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

2016-03-14 19:21:44 -04:00
parent 9f0f432c0a 608e399fde
commit 88033d737d
121 changed files with 1738 additions and 1022 deletions
--- a/include/common.h
+++ b/include/common.h
@@ -807,7 +807,7 @@ void gzwrite_progress_finish(int retcode,
 *				for files under 4GiB
 */
 int gzwrite(unsigned char *src, int len,
-	    struct block_dev_desc *dev,
+	    struct blk_desc *dev,
 	    unsigned long szwritebuf,
 	    u64 startoffs,
 	    u64 szexpected);