diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-06-18 14:07:50 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-06-27 14:42:03 +0800 |
| commit | 70ef2601feb09d40f4086d055700b7923b3c2d6f (patch) | |
| tree | b4c86449ec00d280eaf9b0003ac8680e472ee3dc | |
| parent | d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d (diff) | |
| download | talos-obmc-linux-70ef2601feb09d40f4086d055700b7923b3c2d6f.tar.gz talos-obmc-linux-70ef2601feb09d40f4086d055700b7923b3c2d6f.zip | |
crypto: move arch/x86/include/asm/aes.h to arch/x86/include/asm/crypto/
Move AES header 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>
| -rw-r--r-- | arch/x86/crypto/aes_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/aesni-intel_glue.c | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/crypto/aes.h (renamed from arch/x86/include/asm/aes.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/aes_glue.c b/arch/x86/crypto/aes_glue.c index 8efcf42a9d7e..59b37deb8c8d 100644 --- a/arch/x86/crypto/aes_glue.c +++ b/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/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 7c9d54d8dc4d..d6626152067d 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/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/arch/x86/include/asm/aes.h b/arch/x86/include/asm/crypto/aes.h index 80545a1cbe39..80545a1cbe39 100644 --- a/arch/x86/include/asm/aes.h +++ b/arch/x86/include/asm/crypto/aes.h |
