projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5c680f
)
block: ide: Fix build error when CONFIG_BLK is on
author
Bin Meng
<bmeng.cn@gmail.com>
Mon, 31 Jul 2017 02:24:00 +0000
(19:24 -0700)
committer
Bin Meng
<bmeng.cn@gmail.com>
Tue, 1 Aug 2017 12:17:02 +0000
(20:17 +0800)
Add missing #ifndef CONFIG_BLK to wrap dev_desc->block_read.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/block/ide.c
patch
|
blob
|
history
diff --git
a/drivers/block/ide.c
b/drivers/block/ide.c
index 308ad7396bc6a0da6c1ff3eaca2ab79ac769c76f..edcf87b8c14b6a1ad7e15b9c629c353d22d29a2b 100644
(file)
--- a/
drivers/block/ide.c
+++ b/
drivers/block/ide.c
@@
-469,7
+469,9
@@
static void atapi_inquiry(struct blk_desc *dev_desc)
device = dev_desc->devnum;
dev_desc->type = DEV_TYPE_UNKNOWN; /* not yet valid */
+#ifndef CONFIG_BLK
dev_desc->block_read = atapi_read;
+#endif
memset(ccb, 0, sizeof(ccb));
memset(iobuf, 0, sizeof(iobuf));