diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-12-16 15:53:52 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-12-16 15:53:52 +0100 |
commit | d09476018bee39495d6ece7a2e069de29a9c0ed5 (patch) | |
tree | 866fff4323f94681e6b423f269f0549df0a34066 /arch/x86/crypto/serpent_avx2_glue.c | |
parent | 337bb336b95bd7884fa3a194eafbdf52a0216b2e (diff) | |
parent | afdcd431cebe3498db9aa963c780fdd5099917ec (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/x86/crypto/serpent_avx2_glue.c')
-rw-r--r-- | arch/x86/crypto/serpent_avx2_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/serpent_avx2_glue.c b/arch/x86/crypto/serpent_avx2_glue.c index 23aabc6c20a5..2fae489b1524 100644 --- a/arch/x86/crypto/serpent_avx2_glue.c +++ b/arch/x86/crypto/serpent_avx2_glue.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include <linux/crypto.h> #include <linux/err.h> +#include <crypto/ablk_helper.h> #include <crypto/algapi.h> #include <crypto/ctr.h> #include <crypto/lrw.h> @@ -22,7 +23,6 @@ #include <asm/xcr.h> #include <asm/xsave.h> #include <asm/crypto/serpent-avx.h> -#include <asm/crypto/ablk_helper.h> #include <asm/crypto/glue_helper.h> #define SERPENT_AVX2_PARALLEL_BLOCKS 16 |