diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:49 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:49 +0800 |
| commit | a38b2dd146c0bba28633fe857f0c4626e0c691cc (patch) | |
| tree | 2d81121c3690a36a3679bc78552067eee74c2c81 /include/linux/ccp.h | |
| parent | 7ecc9777c5c76d7b31c376ffd4f59c4a85472a1b (diff) | |
| parent | d59dabdc4cb380b79c965af28cd4ba001f04834b (diff) | |
Merge tag 'v4.9.52' into linux-linaro-lsk-v4.9lsk-v4.9-17.09
This is the 4.9.52 stable release
Diffstat (limited to 'include/linux/ccp.h')
| -rw-r--r-- | include/linux/ccp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h index edc5d04b9632..1cfe5ef3060b 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h @@ -1,7 +1,7 @@ /* * AMD Cryptographic Coprocessor (CCP) driver * - * Copyright (C) 2013,2016 Advanced Micro Devices, Inc. + * Copyright (C) 2013,2017 Advanced Micro Devices, Inc. * * Author: Tom Lendacky <thomas.lendacky@amd.com> * Author: Gary R Hook <gary.hook@amd.com> @@ -222,6 +222,7 @@ enum ccp_xts_aes_unit_size { * AES operation the new IV overwrites the old IV. */ struct ccp_xts_aes_engine { + enum ccp_aes_type type; enum ccp_aes_action action; enum ccp_xts_aes_unit_size unit_size; |