diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-28 20:19:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-28 20:19:47 -0800 |
| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe (patch) | |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 /crypto/internal.h | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| download | linux-stable-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.gz linux-stable-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.bz2 linux-stable-e3c6d4ee545e427b55882d97d3b663c6411645fe.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sparc64/kernel/idprom.c
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 8ef72d76092e..3c19a27a7563 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -109,6 +109,8 @@ void crypto_alg_tested(const char *name, int err); void crypto_shoot_alg(struct crypto_alg *alg); struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, u32 mask); +struct crypto_tfm *crypto_create_tfm(struct crypto_alg *alg, + const struct crypto_type *frontend); int crypto_register_instance(struct crypto_template *tmpl, struct crypto_instance *inst); |