diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /crypto/internal.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
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 fc76e1f37fc3..113579a82dff 100644 --- a/crypto/internal.h +++ b/crypto/internal.h | |||
| @@ -121,9 +121,6 @@ int crypto_register_notifier(struct notifier_block *nb); | |||
| 121 | int crypto_unregister_notifier(struct notifier_block *nb); | 121 | int crypto_unregister_notifier(struct notifier_block *nb); |
| 122 | int crypto_probing_notify(unsigned long val, void *v); | 122 | int crypto_probing_notify(unsigned long val, void *v); |
| 123 | 123 | ||
| 124 | int __init testmgr_init(void); | ||
| 125 | void testmgr_exit(void); | ||
| 126 | |||
| 127 | static inline void crypto_alg_put(struct crypto_alg *alg) | 124 | static inline void crypto_alg_put(struct crypto_alg *alg) |
| 128 | { | 125 | { |
| 129 | if (atomic_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy) | 126 | if (atomic_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy) |