From 02e5d4f0d029a32552b8bfbf4d5731327cf6fa83 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 23 Oct 2007 22:37:23 +0200
Subject: [PATCH] --- yaml --- r: 72363 b: refs/heads/master c:
 9b58aebc73095c045826d891f8e8de6d5bd48c12 h: refs/heads/master i:   72361:
 10d575f1dbfa5c278d2af34b57811a54a66a09ca   72359:
 f7eb8ee389b23c4aa2fe1c7a844a543e76bb4b51 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/x86/crypto/Makefile    | 20 +++++++++++++++-----
 trunk/arch/x86/crypto/Makefile_32 | 12 ------------
 trunk/arch/x86/crypto/Makefile_64 | 12 ------------
 4 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 trunk/arch/x86/crypto/Makefile_32
 delete mode 100644 trunk/arch/x86/crypto/Makefile_64

diff --git a/[refs] b/[refs]
index 36f64ec0034d..0804bba288fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bec2c48c2045ca467d07bba54783318b8672bda7
+refs/heads/master: 9b58aebc73095c045826d891f8e8de6d5bd48c12
diff --git a/trunk/arch/x86/crypto/Makefile b/trunk/arch/x86/crypto/Makefile
index 18dcdc6fb7aa..46bb609e2444 100644
--- a/trunk/arch/x86/crypto/Makefile
+++ b/trunk/arch/x86/crypto/Makefile
@@ -1,5 +1,15 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/crypto/Makefile_32
-else
-include ${srctree}/arch/x86/crypto/Makefile_64
-endif
+#
+# Arch-specific CryptoAPI modules.
+#
+
+obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
+obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
+
+obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
+obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
+
+aes-i586-y := aes-i586-asm_32.o aes_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
+
+aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
+twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o
diff --git a/trunk/arch/x86/crypto/Makefile_32 b/trunk/arch/x86/crypto/Makefile_32
deleted file mode 100644
index 2d873a2388ed..000000000000
--- a/trunk/arch/x86/crypto/Makefile_32
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# x86/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
-obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
-
-aes-i586-y := aes-i586-asm_32.o aes_32.o
-twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
-
diff --git a/trunk/arch/x86/crypto/Makefile_64 b/trunk/arch/x86/crypto/Makefile_64
deleted file mode 100644
index b40896276e93..000000000000
--- a/trunk/arch/x86/crypto/Makefile_64
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# x86/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
-obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
-
-aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
-twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o
-