diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 16:31:22 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 16:31:22 +0100 |
| commit | 7174752387f200474c32a38c8ee7184d2744d426 (patch) | |
| tree | 28487066573424d80d3df4f9ad3995c4f785ff1d | |
| parent | fa8a03bec68d9ef89da72277bd3501ed3daa6217 (diff) | |
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>
| -rw-r--r-- | drivers/crypto/mxs-dcp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c index 620ffc2f4e62..c3b78d791a7c 100644 --- a/drivers/crypto/mxs-dcp.c +++ b/drivers/crypto/mxs-dcp.c @@ -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, |