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 /include/linux/ccp.h | |
| parent | 796b40c6171456274b02447e1dbbea97456403fe (diff) | |
| parent | 40c98cb57cdbc377456116ad4582c89e329721b0 (diff) | |
| download | talos-op-linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.gz talos-op-linux-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 'include/linux/ccp.h')
| -rw-r--r-- | include/linux/ccp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h index dbe8aa0f2940..3285c944194a 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h @@ -621,7 +621,7 @@ enum ccp_engine { * struct ccp_cmd - CCP operation request * @entry: list element (ccp driver use only) * @work: work element used for callbacks (ccp driver use only) - * @ccp: CCP device to be run on (ccp driver use only) + * @ccp: CCP device to be run on * @ret: operation return code (ccp driver use only) * @flags: cmd processing flags * @engine: CCP operation to perform |
