diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-11-26 15:06:19 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-11-26 15:06:19 +0100 |
| commit | 2ea352d5960ad469f5712cf3e293db97beac4e01 (patch) | |
| tree | c24ae19073f2884867b310ee193d36a82075b60f /drivers/crypto/omap-aes.h | |
| parent | Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up c... (diff) | |
| parent | Merge tag 'for-linus-5.5-1' of git://github.com/cminyard/linux-ipmi (diff) | |
| download | linux-2ea352d5960ad469f5712cf3e293db97beac4e01.tar.xz linux-2ea352d5960ad469f5712cf3e293db97beac4e01.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up BPF changes we'll need.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/crypto/omap-aes.h')
| -rw-r--r-- | drivers/crypto/omap-aes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/omap-aes.h b/drivers/crypto/omap-aes.h index 2d4b1f87a1c9..2d3575231e31 100644 --- a/drivers/crypto/omap-aes.h +++ b/drivers/crypto/omap-aes.h @@ -112,7 +112,7 @@ struct omap_aes_reqctx { #define OMAP_AES_CACHE_SIZE 0 struct omap_aes_algs_info { - struct crypto_alg *algs_list; + struct skcipher_alg *algs_list; unsigned int size; unsigned int registered; }; @@ -162,7 +162,7 @@ struct omap_aes_dev { struct aead_queue aead_queue; spinlock_t lock; - struct ablkcipher_request *req; + struct skcipher_request *req; struct aead_request *aead_req; struct crypto_engine *engine; |