Merge master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / crypto / hash.c

diff --git a/crypto/hash.c b/crypto/hash.c
index 0d7caa9..cb86b19 100644 (file)
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -9,6 +9,7 @@
  * any later version.
  */
 
+#include <crypto/internal/hash.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -128,7 +129,6 @@ static int crypto_init_hash_ops_async(struct crypto_tfm *tfm)
        crt->digest     = hash_async_digest;
        crt->setkey     = hash_async_setkey;
        crt->digestsize = alg->digestsize;
-       crt->base       = __crypto_ahash_cast(tfm);
 
        return 0;
 }