diff options
| -rw-r--r-- | arch/x86/crypto/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/Makefile_64 (renamed from arch/x86_64/crypto/Makefile_64) | 2 | ||||
| -rw-r--r-- | arch/x86/crypto/aes-x86_64-asm_64.S (renamed from arch/x86_64/crypto/aes-x86_64-asm_64.S) | 0 | ||||
| -rw-r--r-- | arch/x86/crypto/aes_64.c (renamed from arch/x86_64/crypto/aes_64.c) | 0 | ||||
| -rw-r--r-- | arch/x86/crypto/twofish-x86_64-asm_64.S (renamed from arch/x86_64/crypto/twofish-x86_64-asm_64.S) | 0 | ||||
| -rw-r--r-- | arch/x86/crypto/twofish_64.c (renamed from arch/x86_64/crypto/twofish_64.c) | 0 | ||||
| -rw-r--r-- | arch/x86_64/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86_64/crypto/Makefile | 5 |
8 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index b1bcf7c6302..18dcdc6fb7a 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/crypto/Makefile_32 else -include ${srctree}/arch/x86_64/crypto/Makefile_64 +include ${srctree}/arch/x86/crypto/Makefile_64 endif diff --git a/arch/x86_64/crypto/Makefile_64 b/arch/x86/crypto/Makefile_64 index c96faeb842c..b40896276e9 100644 --- a/arch/x86_64/crypto/Makefile_64 +++ b/arch/x86/crypto/Makefile_64 @@ -1,5 +1,5 @@ # -# x86_64/crypto/Makefile +# x86/crypto/Makefile # # Arch-specific CryptoAPI modules. # diff --git a/arch/x86_64/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S index 26b40de4d0b..26b40de4d0b 100644 --- a/arch/x86_64/crypto/aes-x86_64-asm_64.S +++ b/arch/x86/crypto/aes-x86_64-asm_64.S diff --git a/arch/x86_64/crypto/aes_64.c b/arch/x86/crypto/aes_64.c index 5cdb13ea5cc..5cdb13ea5cc 100644 --- a/arch/x86_64/crypto/aes_64.c +++ b/arch/x86/crypto/aes_64.c diff --git a/arch/x86_64/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S index 35974a58661..35974a58661 100644 --- a/arch/x86_64/crypto/twofish-x86_64-asm_64.S +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S diff --git a/arch/x86_64/crypto/twofish_64.c b/arch/x86/crypto/twofish_64.c index 182d91d5cfb..182d91d5cfb 100644 --- a/arch/x86_64/crypto/twofish_64.c +++ b/arch/x86/crypto/twofish_64.c diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 0416dd2f2db..265484c1723 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -76,7 +76,7 @@ head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/k libs-y += arch/x86_64/lib/ core-y += arch/x86_64/kernel/ \ arch/x86_64/mm/ \ - arch/x86_64/crypto/ \ + arch/x86/crypto/ \ arch/x86_64/vdso/ core-$(CONFIG_IA32_EMULATION) += arch/x86_64/ia32/ drivers-$(CONFIG_PCI) += arch/x86_64/pci/ diff --git a/arch/x86_64/crypto/Makefile b/arch/x86_64/crypto/Makefile deleted file mode 100644 index b1bcf7c6302..00000000000 --- a/arch/x86_64/crypto/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/x86/crypto/Makefile_32 -else -include ${srctree}/arch/x86_64/crypto/Makefile_64 -endif |