diff options
author | Dave Airlie <airlied@redhat.com> | 2009-09-08 14:49:32 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-08 14:49:32 +1000 |
commit | cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d (patch) | |
tree | ce46a55f673cd2e669e9ccf625e6101a52138624 /include/crypto/algapi.h | |
parent | c746e205f2fb6f74b4a622382607f065eca5eb49 (diff) | |
parent | 3ff323f89075624b6891e7c428edb8e8a35be13c (diff) |
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
This was a non-trivial merge with some patches sent to Linus
in drm-fixes.
Conflicts:
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv515.c
Diffstat (limited to 'include/crypto/algapi.h')
-rw-r--r-- | include/crypto/algapi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index 010545436efa..5a2bd1cc9656 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h @@ -137,6 +137,7 @@ struct crypto_instance *crypto_alloc_instance(const char *name, void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen); int crypto_enqueue_request(struct crypto_queue *queue, struct crypto_async_request *request); +void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset); struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue); int crypto_tfm_in_queue(struct crypto_queue *queue, struct crypto_tfm *tfm); |