summaryrefslogtreecommitdiff
path: root/crypto/compress.c
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
committerHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
commit1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch)
tree1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/compress.c
parent39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff)
parent30800d10f2872689cd78711f26b065494df8bb74 (diff)
downloadlinux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz
linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'crypto/compress.c')
-rw-r--r--crypto/compress.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/compress.c b/crypto/compress.c
index 1ee35708..c33f0763 100644
--- a/crypto/compress.c
+++ b/crypto/compress.c
@@ -7,7 +7,7 @@
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
+ * Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
*/
@@ -39,7 +39,7 @@ int crypto_init_compress_ops(struct crypto_tfm *tfm)
ops->cot_compress = crypto_compress;
ops->cot_decompress = crypto_decompress;
-
+
return 0;
}