Merge remote-tracking branch 'crypto/master'

[karo-tx-linux.git] / fs / ext4 / ext4_crypto.h

diff --git a/fs/ext4/ext4_crypto.h b/fs/ext4/ext4_crypto.h
index ac7d4e81379630d2f720ea8d389b8322a784f4cf..1f73c29717e19f656db7b9745c8e61c67baa0ff1 100644 (file)
--- a/fs/ext4/ext4_crypto.h
+++ b/fs/ext4/ext4_crypto.h
@@ -77,7 +77,7 @@ struct ext4_crypt_info {
        char            ci_data_mode;
        char            ci_filename_mode;
        char            ci_flags;
-       struct crypto_ablkcipher *ci_ctfm;
+       struct crypto_skcipher *ci_ctfm;
        struct key      *ci_keyring_key;
        char            ci_master_key[EXT4_KEY_DESCRIPTOR_SIZE];
 };