summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/lib/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-16 13:31:51 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-16 13:31:55 +0100
commit48fa4b8ecf683f5e411303553da9e186e8b8406e (patch)
tree76cec4aa8cca18a44b1bd6e5be68c462a0e66d5f /arch/m68knommu/lib/Makefile
parentd95f412200652694e63e64bfd49f0ae274a54479 (diff)
parent85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff)
downloadlinux-stable-48fa4b8ecf683f5e411303553da9e186e8b8406e.tar.gz
linux-stable-48fa4b8ecf683f5e411303553da9e186e8b8406e.tar.bz2
linux-stable-48fa4b8ecf683f5e411303553da9e186e8b8406e.zip
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68knommu/lib/Makefile')
-rw-r--r--arch/m68knommu/lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/lib/Makefile b/arch/m68knommu/lib/Makefile
index d94d709665aa..32d852e586d7 100644
--- a/arch/m68knommu/lib/Makefile
+++ b/arch/m68knommu/lib/Makefile
@@ -4,4 +4,4 @@
lib-y := ashldi3.o ashrdi3.o lshrdi3.o \
muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
- checksum.o memcpy.o memset.o delay.o
+ checksum.o memcpy.o memmove.o memset.o delay.o