summaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-14 19:21:44 -0400
committerTom Rini <trini@konsulko.com>2016-03-14 19:21:44 -0400
commit88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch)
tree0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /include/common.h
parent9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff)
parent608e399fdef82e983db44c5cb8f5e772bba870e2 (diff)
downloadblackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.gz
blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.zip
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index 3e1a4c98b7..f9f4605dba 100644
--- 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);
OpenPOWER on IntegriCloud