projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-drm-fsl-dcu.git]
/
arch
/
x86
/
crypto
/
cast6_avx_glue.c
diff --git
a/arch/x86/crypto/cast6_avx_glue.c
b/arch/x86/crypto/cast6_avx_glue.c
index 8d0dfb86a5593554e0d536a48c28572ecc92c91d..09f3677393e4b888895c83bae05d114df0d5184c 100644
(file)
--- a/
arch/x86/crypto/cast6_avx_glue.c
+++ b/
arch/x86/crypto/cast6_avx_glue.c
@@
-28,6
+28,7
@@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
+#include <crypto/ablk_helper.h>
#include <crypto/algapi.h>
#include <crypto/cast6.h>
#include <crypto/cryptd.h>
#include <crypto/algapi.h>
#include <crypto/cast6.h>
#include <crypto/cryptd.h>
@@
-37,7
+38,6
@@
#include <crypto/xts.h>
#include <asm/xcr.h>
#include <asm/xsave.h>
#include <crypto/xts.h>
#include <asm/xcr.h>
#include <asm/xsave.h>
-#include <asm/crypto/ablk_helper.h>
#include <asm/crypto/glue_helper.h>
#define CAST6_PARALLEL_BLOCKS 8
#include <asm/crypto/glue_helper.h>
#define CAST6_PARALLEL_BLOCKS 8