diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/s390/crypto/sha512_s390.c | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/s390/crypto/sha512_s390.c')
| -rw-r--r-- | arch/s390/crypto/sha512_s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c index 4bf73d0dc525..32a81383b69c 100644 --- a/arch/s390/crypto/sha512_s390.c +++ b/arch/s390/crypto/sha512_s390.c | |||
| @@ -132,7 +132,7 @@ static int __init init(void) | |||
| 132 | { | 132 | { |
| 133 | int ret; | 133 | int ret; |
| 134 | 134 | ||
| 135 | if (!crypt_s390_func_available(KIMD_SHA_512)) | 135 | if (!crypt_s390_func_available(KIMD_SHA_512, CRYPT_S390_MSA)) |
| 136 | return -EOPNOTSUPP; | 136 | return -EOPNOTSUPP; |
| 137 | if ((ret = crypto_register_shash(&sha512_alg)) < 0) | 137 | if ((ret = crypto_register_shash(&sha512_alg)) < 0) |
| 138 | goto out; | 138 | goto out; |