crypto: mxs-dcp: remove merge conflict markers
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
parent
fa8a03bec6
commit
7174752387
|
@ -595,8 +595,6 @@ static int mxs_dcp_run_sha(struct ahash_request *req)
|
|||
desc->payload = 0;
|
||||
desc->status = 0;
|
||||
|
||||
==== BASE ====
|
||||
==== BASE ====
|
||||
/* Set HASH_TERM bit for last transfer block. */
|
||||
if (rctx->fini) {
|
||||
digest_phys = dma_map_single(sdcp->dev, sdcp->coh->sha_out_buf,
|
||||
|
|
Loading…
Reference in New Issue