diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /Documentation/crypto/api-intro.txt | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'Documentation/crypto/api-intro.txt')
| -rw-r--r-- | Documentation/crypto/api-intro.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt index e41a79aa71ce..9b84b805ab75 100644 --- a/Documentation/crypto/api-intro.txt +++ b/Documentation/crypto/api-intro.txt | |||
| @@ -60,7 +60,7 @@ Here's an example of how to use the API: | |||
| 60 | desc.tfm = tfm; | 60 | desc.tfm = tfm; |
| 61 | desc.flags = 0; | 61 | desc.flags = 0; |
| 62 | 62 | ||
| 63 | if (crypto_hash_digest(&desc, &sg, 2, result)) | 63 | if (crypto_hash_digest(&desc, sg, 2, result)) |
| 64 | fail(); | 64 | fail(); |
| 65 | 65 | ||
| 66 | crypto_free_hash(tfm); | 66 | crypto_free_hash(tfm); |