Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-drm-fsl-dcu.git] / crypto / sha256.c

diff --git a/crypto/sha256.c b/crypto/sha256.c
index bc71d85a7d02de57f07ea6b7bbd0825c5a5776ad..716195bb54f247b936dd1e6ef6d655eec3dca79d 100644 (file)
--- a/crypto/sha256.c
+++ b/crypto/sha256.c
@@ -309,6 +309,7 @@ static void sha256_final(struct crypto_tfm *tfm, u8 *out)
 
 static struct crypto_alg alg = {
        .cra_name       =       "sha256",
+       .cra_driver_name=       "sha256-generic",
        .cra_flags      =       CRYPTO_ALG_TYPE_DIGEST,
        .cra_blocksize  =       SHA256_HMAC_BLOCK_SIZE,
        .cra_ctxsize    =       sizeof(struct sha256_ctx),
@@ -337,3 +338,5 @@ module_exit(fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm");
+
+MODULE_ALIAS("sha256-generic");