From 8176b89ed32ee272450c3985442b6589a525bdd0 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Mon, 18 Jun 2012 14:07:45 +0300
Subject: [PATCH] --- yaml --- r: 318357 b: refs/heads/master c:
 d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d h: refs/heads/master i:   318355:
 9eb1e290a58575908e400d3519adeba641db58c7 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/x86/crypto/serpent_avx_glue.c               | 2 +-
 trunk/arch/x86/crypto/serpent_sse2_glue.c              | 2 +-
 trunk/arch/x86/include/asm/{ => crypto}/serpent-avx.h  | 0
 trunk/arch/x86/include/asm/{ => crypto}/serpent-sse2.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/arch/x86/include/asm/{ => crypto}/serpent-avx.h (100%)
 rename trunk/arch/x86/include/asm/{ => crypto}/serpent-sse2.h (100%)

diff --git a/[refs] b/[refs]
index 00404ff5b1ee..47e870f61bd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7378d4e552ac139ae1cbbdfebfeaa9b18c948d0
+refs/heads/master: d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d
diff --git a/trunk/arch/x86/crypto/serpent_avx_glue.c b/trunk/arch/x86/crypto/serpent_avx_glue.c
index c61b91aa42a8..b36bdac237eb 100644
--- a/trunk/arch/x86/crypto/serpent_avx_glue.c
+++ b/trunk/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/trunk/arch/x86/crypto/serpent_sse2_glue.c b/trunk/arch/x86/crypto/serpent_sse2_glue.c
index 49a32eedf0c8..d679c8675f4a 100644
--- a/trunk/arch/x86/crypto/serpent_sse2_glue.c
+++ b/trunk/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/trunk/arch/x86/include/asm/serpent-avx.h b/trunk/arch/x86/include/asm/crypto/serpent-avx.h
similarity index 100%
rename from trunk/arch/x86/include/asm/serpent-avx.h
rename to trunk/arch/x86/include/asm/crypto/serpent-avx.h
diff --git a/trunk/arch/x86/include/asm/serpent-sse2.h b/trunk/arch/x86/include/asm/crypto/serpent-sse2.h
similarity index 100%
rename from trunk/arch/x86/include/asm/serpent-sse2.h
rename to trunk/arch/x86/include/asm/crypto/serpent-sse2.h