diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 16:37:23 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 16:37:23 -0400 |
commit | 9b58aebc73095c045826d891f8e8de6d5bd48c12 (patch) | |
tree | 02aa3ca6d2798c9c9597c3c49c7f2e3f696484c6 /arch | |
parent | bec2c48c2045ca467d07bba54783318b8672bda7 (diff) |
x86: merge arch/x86/crypto Makefiles
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/crypto/Makefile | 20 | ||||
-rw-r--r-- | arch/x86/crypto/Makefile_32 | 12 | ||||
-rw-r--r-- | arch/x86/crypto/Makefile_64 | 12 |
3 files changed, 15 insertions, 29 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 18dcdc6fb7aa..46bb609e2444 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile | |||
@@ -1,5 +1,15 @@ | |||
1 | ifeq ($(CONFIG_X86_32),y) | 1 | # |
2 | include ${srctree}/arch/x86/crypto/Makefile_32 | 2 | # Arch-specific CryptoAPI modules. |
3 | else | 3 | # |
4 | include ${srctree}/arch/x86/crypto/Makefile_64 | 4 | |
5 | endif | 5 | obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o |
6 | obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o | ||
7 | |||
8 | obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o | ||
9 | obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o | ||
10 | |||
11 | aes-i586-y := aes-i586-asm_32.o aes_32.o | ||
12 | twofish-i586-y := twofish-i586-asm_32.o twofish_32.o | ||
13 | |||
14 | aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o | ||
15 | twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o | ||
diff --git a/arch/x86/crypto/Makefile_32 b/arch/x86/crypto/Makefile_32 deleted file mode 100644 index 2d873a2388ed..000000000000 --- a/arch/x86/crypto/Makefile_32 +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # | ||
2 | # x86/crypto/Makefile | ||
3 | # | ||
4 | # Arch-specific CryptoAPI modules. | ||
5 | # | ||
6 | |||
7 | obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o | ||
8 | obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o | ||
9 | |||
10 | aes-i586-y := aes-i586-asm_32.o aes_32.o | ||
11 | twofish-i586-y := twofish-i586-asm_32.o twofish_32.o | ||
12 | |||
diff --git a/arch/x86/crypto/Makefile_64 b/arch/x86/crypto/Makefile_64 deleted file mode 100644 index b40896276e93..000000000000 --- a/arch/x86/crypto/Makefile_64 +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # | ||
2 | # x86/crypto/Makefile | ||
3 | # | ||
4 | # Arch-specific CryptoAPI modules. | ||
5 | # | ||
6 | |||
7 | obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o | ||
8 | obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o | ||
9 | |||
10 | aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o | ||
11 | twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o | ||
12 | |||