diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
| commit | e286091b2b21d1ff9166609cd19e0df62b56f4bc (patch) | |
| tree | ba7bda5449376d04f32a3414dabc732f7375804d /crypto/internal.h | |
| parent | a5dc0ad5e24d2cdb1a46cc19761605e5902f83eb (diff) | |
| parent | 0b4d1afc94f1724db95c365d3e36f1578ac96dbc (diff) | |
| download | linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.tar.gz linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.zip | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
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 fc76e1f3..113579a8 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -121,9 +121,6 @@ int crypto_register_notifier(struct notifier_block *nb); int crypto_unregister_notifier(struct notifier_block *nb); int crypto_probing_notify(unsigned long val, void *v); -int __init testmgr_init(void); -void testmgr_exit(void); - static inline void crypto_alg_put(struct crypto_alg *alg) { if (atomic_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy) |