Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / arch / arm / lib / Makefile

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 866f84a586ff7281b7aa70ab9af4a89d80a88079..030ba7219f482bfd9873b196d1a8634d5fc2eacb 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -29,6 +29,9 @@ else
 endif
 endif
 
+# using lib_ here won't override already available weak symbols
+obj-$(CONFIG_UACCESS_WITH_MEMCPY) += uaccess_with_memcpy.o
+
 lib-$(CONFIG_MMU) += $(mmu-y)
 
 ifeq ($(CONFIG_CPU_32v3),y)