Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-beck.git] / drivers / crypto / geode-aes.h

diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index f1855b50da48d53cbc3e1f2d6d953529e56252d5..f442ca972e3c0c88aa87e7790e5ada0b510b0155 100644 (file)
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -10,10 +10,6 @@
 #define _GEODE_AES_H_
 
 /* driver logic flags */
-#define AES_IV_LENGTH  16
-#define AES_KEY_LENGTH 16
-#define AES_MIN_BLOCK_SIZE 16
-
 #define AES_MODE_ECB 0
 #define AES_MODE_CBC 1
 
@@ -64,7 +60,7 @@ struct geode_aes_op {
        u32 flags;
        int len;
 
-       u8 key[AES_KEY_LENGTH];
+       u8 key[AES_KEYSIZE_128];
        u8 *iv;
 
        union {