diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 09:57:18 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 09:57:18 -0800 |
| commit | 1ede28e658b8f2dd7c2ce9d3829742f9e5ea9fc9 (patch) | |
| tree | 9fe0061d9e4c63f84ddf8674e88e35a82f3a8ae3 /crypto/internal.h | |
| parent | 38d20e9265b6677dd840e4ba4ef012a0044948a2 (diff) | |
| parent | ba53933de8ea9024cdb1d3650f66da9f264d1bcc (diff) | |
| download | linux-crypto-1ede28e658b8f2dd7c2ce9d3829742f9e5ea9fc9.tar.gz linux-crypto-1ede28e658b8f2dd7c2ce9d3829742f9e5ea9fc9.zip | |
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through
power supply tree.
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 7eefcdb0..f0732042 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -76,9 +76,6 @@ struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask); int crypto_init_cipher_ops(struct crypto_tfm *tfm); int crypto_init_compress_ops(struct crypto_tfm *tfm); -void crypto_exit_cipher_ops(struct crypto_tfm *tfm); -void crypto_exit_compress_ops(struct crypto_tfm *tfm); - struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask); void crypto_larval_kill(struct crypto_alg *alg); struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask); |