diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-14 20:41:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 20:41:53 +0000 |
| commit | 64a9aa9cf57dd551a9ae9bf48f5e63be608aae72 (patch) | |
| tree | d5776aa6b85c7a0c4fa3565bd3881f9607c293dc /arch/x86/crypto/serpent_avx_glue.c | |
| parent | 16d7ea9167839d0b971ab29030886280595dd5fc (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| download | kernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.tar.gz kernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.tar.bz2 kernel_replicant_linux-64a9aa9cf57dd551a9ae9bf48f5e63be608aae72.zip | |
Merge tag 'v3.13-rc3' into asoc-pcm
Linux 3.13-rc3
Diffstat (limited to 'arch/x86/crypto/serpent_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/serpent_avx_glue.c | 2 |
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 */ |