Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / crypto / cast6.h

diff --git a/include/crypto/cast6.h b/include/crypto/cast6.h
index 157af6f342c80229d008c345ac2a5dfc640de587..32b60eb8bd24ee67996674440346b7c9e7e9352c 100644 (file)
--- a/include/crypto/cast6.h
+++ b/include/crypto/cast6.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/crypto.h>
+#include <crypto/cast_common.h>
 
 #define CAST6_BLOCK_SIZE 16
 #define CAST6_MIN_KEY_SIZE 16
@@ -20,9 +21,4 @@ int cast6_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen);
 void __cast6_encrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src);
 void __cast6_decrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src);
 
-extern const u32 cast6_s1[256];
-extern const u32 cast6_s2[256];
-extern const u32 cast6_s3[256];
-extern const u32 cast6_s4[256];
-
 #endif