Merge branch 'linux-2.6'

[linux-2.6] / crypto / crypto_null.c

diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index a0d956b529498c84ea39f2888e63878d143adc6c..29f77477d701859e5dc34c72035d2c9e39108c67 100644 (file)
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/string.h>
 
@@ -48,7 +47,7 @@ static void null_final(struct crypto_tfm *tfm, u8 *out)
 { }
 
 static int null_setkey(struct crypto_tfm *tfm, const u8 *key,
-                      unsigned int keylen, u32 *flags)
+                      unsigned int keylen)
 { return 0; }
 
 static void null_crypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)