From f4dc21c03e2a2a5ef42f5f1b733ead492d4ff9ab Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:11:46 +0200
Subject: [PATCH] --- yaml --- r: 65345 b: refs/heads/master c:
 b673187cba8a5bcd28455b8540d8542df1d85d9b h: refs/heads/master i:   65343:
 7bf1215a1df5ccfd750d1c5ec8b808f3be6112e2 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/i386/crypto/Makefile    | 17 +++++------------
 trunk/arch/i386/crypto/Makefile_32 | 12 ++++++++++++
 3 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 trunk/arch/i386/crypto/Makefile_32

diff --git a/[refs] b/[refs]
index b43987c794a4..a875034da6db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e980b6d9dee73e879e9c4731d0ef8a3c9d44e6ed
+refs/heads/master: b673187cba8a5bcd28455b8540d8542df1d85d9b
diff --git a/trunk/arch/i386/crypto/Makefile b/trunk/arch/i386/crypto/Makefile
index 7154b14cd950..fbd34ac2cda2 100644
--- a/trunk/arch/i386/crypto/Makefile
+++ b/trunk/arch/i386/crypto/Makefile
@@ -1,12 +1,5 @@
-# 
-# i386/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
-
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/crypto/Makefile_32
+else
+include ${srctree}/arch/x86_64/crypto/Makefile_64
+endif
diff --git a/trunk/arch/i386/crypto/Makefile_32 b/trunk/arch/i386/crypto/Makefile_32
new file mode 100644
index 000000000000..7154b14cd950
--- /dev/null
+++ b/trunk/arch/i386/crypto/Makefile_32
@@ -0,0 +1,12 @@
+# 
+# i386/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
+