summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-08-01 15:38:23 -0400
committerTom Rini <trini@konsulko.com>2017-08-01 15:38:23 -0400
commit5c6631beb27491f3f78b6a0ad888d38810e3d96b (patch)
tree3b02d26a83a2e58bbc0741f2b78474461f273b93 /drivers/scsi/scsi.c
parent6364a5d4bd55beeedc11171419acd0bdff17a599 (diff)
parent5c970013a661c630ab28ddc3dd6766fe6bf83ece (diff)
downloadu-boot-5c6631beb27491f3f78b6a0ad888d38810e3d96b.tar.gz
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r--drivers/scsi/scsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 7ec7ecc295..f192ca597c 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -451,7 +451,7 @@ static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc)
dev_desc->product[0] = 0;
dev_desc->revision[0] = 0;
dev_desc->removable = false;
-#ifndef CONFIG_BLK
+#if !CONFIG_IS_ENABLED(BLK)
dev_desc->block_read = scsi_read;
dev_desc->block_write = scsi_write;
#endif