diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 32001d6b76ef1851c18e826e189d1e1ff9829a59..69e1b025b9a4d645c4bccc97b36c81b19640dfe5 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -408,7 +408,7 @@ static struct crypto_alg geode_cbc_alg = {
 			.setkey			=	geode_setkey_blk,
 			.encrypt		=	geode_cbc_encrypt,
 			.decrypt		=	geode_cbc_decrypt,
-			.ivsize			=	AES_IV_LENGTH,
+			.ivsize			=	AES_BLOCK_SIZE,
 		}
 	}
 };
diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index cedf2c5be118c826e8c47aef1c79756874adc582..73e7b5f0126fa0a1b5ae5829aa6a16b87e1106d8 100644
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -10,7 +10,6 @@
 #define _GEODE_AES_H_
 
 /* driver logic flags */
-#define AES_IV_LENGTH  16
 #define AES_KEY_LENGTH 16
 
 #define AES_MODE_ECB 0