xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge the crypto tree to resolve conflict between caam changes.
This commit is contained in:
Herbert Xu
2017-04-05 21:57:07 +08:00
parent 796b40c617 40c98cb57c
commit c6dc060906
14 changed files with 160 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/ccp.h
View File

@@ -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