From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Mon, 18 Jun 2012 11:07:45 +0000 (+0300)
Subject: crypto: move arch/x86/include/asm/serpent-{sse2|avx}.h to arch/x86/include/asm/crypto/
X-Git-Tag: v3.6-rc1~94^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d;p=users%2Fdwmw2%2Flinux.git

crypto: move arch/x86/include/asm/serpent-{sse2|avx}.h to arch/x86/include/asm/crypto/

Move serpent crypto headers to the new asm/crypto/ directory.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c
index c61b91aa42a8a..b36bdac237eb0 100644
--- a/arch/x86/crypto/serpent_avx_glue.c
+++ b/arch/x86/crypto/serpent_avx_glue.c
@@ -38,7 +38,7 @@
 #include <crypto/xts.h>
 #include <asm/xcr.h>
 #include <asm/xsave.h>
-#include <asm/serpent-avx.h>
+#include <asm/crypto/serpent-avx.h>
 #include <asm/crypto/ablk_helper.h>
 #include <asm/crypto/glue_helper.h>
 
diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c
index 49a32eedf0c83..d679c8675f4ad 100644
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -41,7 +41,7 @@
 #include <crypto/ctr.h>
 #include <crypto/lrw.h>
 #include <crypto/xts.h>
-#include <asm/serpent-sse2.h>
+#include <asm/crypto/serpent-sse2.h>
 #include <asm/crypto/ablk_helper.h>
 #include <asm/crypto/glue_helper.h>
 
diff --git a/arch/x86/include/asm/serpent-avx.h b/arch/x86/include/asm/crypto/serpent-avx.h
similarity index 100%
rename from arch/x86/include/asm/serpent-avx.h
rename to arch/x86/include/asm/crypto/serpent-avx.h
diff --git a/arch/x86/include/asm/serpent-sse2.h b/arch/x86/include/asm/crypto/serpent-sse2.h
similarity index 100%
rename from arch/x86/include/asm/serpent-sse2.h
rename to arch/x86/include/asm/crypto/serpent-sse2.h