diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
| commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
| tree | c8441197c74e9df8407a00eff2433540924ca5ce /drivers/crypto/ccp/ccp-dev-v5.c | |
| parent | crypto: ixp4xx - Use sg_virt() (diff) | |
| parent | crypto: caam - fix RNG deinstantiation error checking (diff) | |
| download | linux-dev-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.xz linux-dev-c6dc0609062c6110d04c54e24b81b503eeadb2c8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'drivers/crypto/ccp/ccp-dev-v5.c')
| -rw-r--r-- | drivers/crypto/ccp/ccp-dev-v5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c index fc5666eb59f2..5e08654c7226 100644 --- 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, |