Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[net-next-2.6.git] / arch / x86_64 / lib / Makefile

diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 43d051ff1fb42ec82195c3b82d81c89d469fd733..c943271783985ff56783ec0eb17b09d7f08836b7 100644 (file)
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_SMP)     += msr-on-cpu.o
 lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \
        usercopy.o getuser.o putuser.o  \
        thunk.o clear_page.o copy_page.o bitstr.o bitops.o
-lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock.o
+lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock.o copy_user_nocache.o