From 43ff02d14dbf7b53644dfe89117df23753e00403 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:13:35 +0200
Subject: [PATCH] --- yaml --- r: 65424 b: refs/heads/master c:
 5fde34fddcb58af7bd08c143389ed074f8715f9f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4123daf732b8..2951a22e2a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d779d8f9f8419e8492959adc267cdf5478bc4748
+refs/heads/master: 5fde34fddcb58af7bd08c143389ed074f8715f9f
diff --git a/trunk/arch/i386/lib/Makefile b/trunk/arch/i386/lib/Makefile
index 98d1f1e2e2ef..2b1547e0ac6b 100644
--- a/trunk/arch/i386/lib/Makefile
+++ b/trunk/arch/i386/lib/Makefile
@@ -1,11 +1,5 @@
-#
-# Makefile for i386-specific library files..
-#
-
-
-lib-y = checksum_32.o delay_32.o usercopy_32.o getuser_32.o putuser_32.o memcpy_32.o strstr_32.o \
-	bitops_32.o semaphore_32.o string_32.o
-
-lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
-
-obj-$(CONFIG_SMP)	+= msr-on-cpu.o
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/lib/Makefile_32
+else
+include ${srctree}/arch/x86_64/lib/Makefile_64
+endif
diff --git a/trunk/arch/i386/lib/Makefile_32 b/trunk/arch/i386/lib/Makefile_32
new file mode 100644
index 000000000000..98d1f1e2e2ef
--- /dev/null
+++ b/trunk/arch/i386/lib/Makefile_32
@@ -0,0 +1,11 @@
+#
+# Makefile for i386-specific library files..
+#
+
+
+lib-y = checksum_32.o delay_32.o usercopy_32.o getuser_32.o putuser_32.o memcpy_32.o strstr_32.o \
+	bitops_32.o semaphore_32.o string_32.o
+
+lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
+
+obj-$(CONFIG_SMP)	+= msr-on-cpu.o