From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 31 Jul 2017 02:24:00 +0000 (-0700)
Subject: block: ide: Fix build error when CONFIG_BLK is on
X-Git-Tag: v2017.09-rc2~135^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=52a1c2c68b40354b82fbd651cdcf212f20fd5486;p=oweals%2Fu-boot.git

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>
---

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));