diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /arch/s390/crypto/sha.h | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'arch/s390/crypto/sha.h')
| -rw-r--r-- | arch/s390/crypto/sha.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/crypto/sha.h b/arch/s390/crypto/sha.h index 1ceafa571eab..f4e9dc71675f 100644 --- a/arch/s390/crypto/sha.h +++ b/arch/s390/crypto/sha.h | |||
| @@ -29,7 +29,9 @@ struct s390_sha_ctx { | |||
| 29 | int func; /* KIMD function to use */ | 29 | int func; /* KIMD function to use */ |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | void s390_sha_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len); | 32 | struct shash_desc; |
| 33 | void s390_sha_final(struct crypto_tfm *tfm, u8 *out); | 33 | |
| 34 | int s390_sha_update(struct shash_desc *desc, const u8 *data, unsigned int len); | ||
| 35 | int s390_sha_final(struct shash_desc *desc, u8 *out); | ||
| 34 | 36 | ||
| 35 | #endif | 37 | #endif |