Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / Makefile

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index e92948203a5dfde38cb998078447ac338e280024..aa3fa4119424205ba297e1af4ce4100ba5514baf 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -5,7 +5,8 @@
 obj-$(CONFIG_SMP) := msr-on-cpu.o
 
 lib-y := delay.o
-lib-y += usercopy_$(BITS).o getuser.o putuser_$(BITS).o
+lib-y += thunk_$(BITS).o
+lib-y += usercopy_$(BITS).o getuser.o putuser.o
 lib-y += memcpy_$(BITS).o
 
 ifeq ($(CONFIG_X86_32),y)