diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-01 15:38:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-01 15:38:32 -0400 |
| commit | 07d778382200a05a8b86cc135f79ec48e386f25a (patch) | |
| tree | 624dc01190640212a9a8a45f4d12d4bd7489145d /drivers/block | |
| parent | 5c6631beb27491f3f78b6a0ad888d38810e3d96b (diff) | |
| parent | 24357dfd2aec4118b9178d8bf639fb8fc02e1859 (diff) | |
| download | u-boot-07d778382200a05a8b86cc135f79ec48e386f25a.tar.gz | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ide.c | 2 |
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)); |