Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict between caam changes.
2017-04-05 21:57:07 +08:00
parent 796b40c617 40c98cb57c
commit c6dc060906
14 changed files with 160 additions and 79 deletions
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -1069,6 +1069,7 @@ const struct ccp_vdata ccpv5a = {

 const struct ccp_vdata ccpv5b = {
 	.version = CCP_VERSION(5, 0),
+	.dma_chan_attr = DMA_PRIVATE,
 	.setup = ccp5other_config,
 	.perform = &ccp5_actions,
 	.bar = 2,