aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-09 13:06:14 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-09 13:06:14 -0400
commit83f7a2c118833d3738b4d162ea3c17d0bd8ffa94 (patch)
tree450cb68d9341e33c38fed76f75696f4bd60be0e1 /include
parentab875cf67e89eef150ae8d4ef09c361e47b6b398 (diff)
parentf13ba2f7d3a877967477ec8f64e1dae7a967c7e2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] skcipher: Fix section mismatches
Diffstat (limited to 'include')
-rw-r--r--include/crypto/internal/skcipher.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index a8f12644a13c..ccc32bad9a89 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -68,7 +68,7 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm);
68int __init eseqiv_module_init(void); 68int __init eseqiv_module_init(void);
69void __exit eseqiv_module_exit(void); 69void __exit eseqiv_module_exit(void);
70int __init chainiv_module_init(void); 70int __init chainiv_module_init(void);
71void __exit chainiv_module_exit(void); 71void chainiv_module_exit(void);
72 72
73static inline struct crypto_ablkcipher *skcipher_geniv_cipher( 73static inline struct crypto_ablkcipher *skcipher_geniv_cipher(
74 struct crypto_ablkcipher *geniv) 74 struct crypto_ablkcipher *geniv)