Merge git://git.infradead.org/ubifs-2.6

[sfrench/cifs-2.6.git] / include / crypto / twofish.h

diff --git a/include/crypto/twofish.h b/include/crypto/twofish.h
index e4328cfaaf64974c413b7674625ba144d8f5f6eb..c408522595c6855ff517e966ea16bf4c9cff19ac 100644 (file)
--- a/include/crypto/twofish.h
+++ b/include/crypto/twofish.h
@@ -17,7 +17,6 @@ struct twofish_ctx {
        u32 s[4][256], w[8], k[32];
 };
 
-int twofish_setkey(struct crypto_tfm *tfm, const u8 *key,
-                  unsigned int key_len, u32 *flags);
+int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len);
 
 #endif