summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2017-07-30 19:24:00 -0700
committerBin Meng <bmeng.cn@gmail.com>2017-08-01 20:17:02 +0800
commit52a1c2c68b40354b82fbd651cdcf212f20fd5486 (patch)
treebb2a1129a7b1e448b5e2f7af09e853ec240ea9f1 /drivers/block
parenta5c680fe1042d2e13efeb12af076f4bd1ad1b82d (diff)
block: ide: Fix build error when CONFIG_BLK is on
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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/ide.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 308ad7396b..edcf87b8c1 100644
--- 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));