---

yaml --- r: 318358 b: refs/heads/master c: 70ef260 h: refs/heads/master v: v3
git-mirror · Jun 27, 2012 · 5f72216 · 5f72216
1 parent 8176b89
commit 5f72216
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d
+refs/heads/master: 70ef2601feb09d40f4086d055700b7923b3c2d6f
diff --git a/trunk/arch/x86/crypto/aes_glue.c b/trunk/arch/x86/crypto/aes_glue.c
@@ -5,7 +5,7 @@
 
 #include <linux/module.h>
 #include <crypto/aes.h>
-#include <asm/aes.h>
+#include <asm/crypto/aes.h>
 
 asmlinkage void aes_enc_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);
 asmlinkage void aes_dec_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);

diff --git a/trunk/arch/x86/crypto/aesni-intel_glue.c b/trunk/arch/x86/crypto/aesni-intel_glue.c
@@ -30,7 +30,7 @@
 #include <crypto/ctr.h>
 #include <asm/cpu_device_id.h>
 #include <asm/i387.h>
-#include <asm/aes.h>
+#include <asm/crypto/aes.h>
 #include <asm/crypto/ablk_helper.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/internal/aead.h>

diff --git a/trunk/arch/x86/include/asm/aes.h → trunk/arch/x86/include/asm/crypto/aes.h b/trunk/arch/x86/include/asm/aes.h → trunk/arch/x86/include/asm/crypto/aes.h