From 7174752387f200474c32a38c8ee7184d2744d426 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 19 Dec 2019 16:31:22 +0100 Subject: crypto: mxs-dcp: remove merge conflict markers Signed-off-by: Max Krummenacher Signed-off-by: Marcel Ziswiler --- drivers/crypto/mxs-dcp.c | 2 -- 1 file changed, 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, -- cgit v1.2.3