summaryrefslogtreecommitdiff
path: root/arch/x86/crypto/serpent_avx_glue.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-12-16 18:53:52 +0400
committerTakashi Iwai <tiwai@suse.de>2013-12-16 18:53:52 +0400
commitd09476018bee39495d6ece7a2e069de29a9c0ed5 (patch)
tree866fff4323f94681e6b423f269f0549df0a34066 /arch/x86/crypto/serpent_avx_glue.c
parent337bb336b95bd7884fa3a194eafbdf52a0216b2e (diff)
parentafdcd431cebe3498db9aa963c780fdd5099917ec (diff)
downloadlinux-d09476018bee39495d6ece7a2e069de29a9c0ed5.tar.xz
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/x86/crypto/serpent_avx_glue.c')
-rw-r--r--arch/x86/crypto/serpent_avx_glue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c
index 9ae83cf8d21e..ff4870870972 100644
--- a/arch/x86/crypto/serpent_avx_glue.c
+++ b/arch/x86/crypto/serpent_avx_glue.c
@@ -28,6 +28,7 @@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
+#include <crypto/ablk_helper.h>
#include <crypto/algapi.h>
#include <crypto/serpent.h>
#include <crypto/cryptd.h>
@@ -38,7 +39,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>
/* 8-way parallel cipher functions */