projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
sandboxblockdev.h
diff --git
a/include/sandboxblockdev.h
b/include/sandboxblockdev.h
index
627787a
..
5174f45
100644
(file)
--- a/
include/sandboxblockdev.h
+++ b/
include/sandboxblockdev.h
@@
-8,7
+8,9
@@
#define __SANDBOX_BLOCK_DEV__
struct host_block_dev {
- block_dev_desc_t blk_dev;
+#ifndef CONFIG_BLK
+ struct blk_desc blk_dev;
+#endif
char *filename;
int fd;
};