Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

[~andy/linux] / crypto / serpent.c

diff --git a/crypto/serpent.c b/crypto/serpent.c
index 7d152e89016fa8f142c44e015298ea20c1b6c612..3cf2c5067eea821a24bc60638feee720c68e2c8d 100644 (file)
--- a/crypto/serpent.c
+++ b/crypto/serpent.c
@@ -210,7 +210,6 @@
        x4 ^= x2;
 
 struct serpent_ctx {
-       u8 iv[SERPENT_BLOCK_SIZE];
        u32 expkey[SERPENT_EXPKEY_WORDS];
 };