From 52a1c2c68b40354b82fbd651cdcf212f20fd5486 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 30 Jul 2017 19:24:00 -0700 Subject: [PATCH] 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 Reviewed-by: Simon Glass --- drivers/block/ide.c | 2 ++ 1 file changed, 2 insertions(+) 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)); -- 2.39.5