Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / arch / i386 / lib / Makefile

diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile
index 0d41223472c2a159557c110bf67dc1cd5f5eda05..4d105fdfe817f2c30ba5e588ff847867149f3a35 100644 (file)
--- a/arch/i386/lib/Makefile
+++ b/arch/i386/lib/Makefile
@@ -4,8 +4,8 @@
 
 
 lib-y = checksum.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr.o \
-       bitops.o semaphore.o
+       bitops.o semaphore.o string.o
 
 lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
 
-obj-y = msr-on-cpu.o
+obj-$(CONFIG_SMP)      += msr-on-cpu.o