diff options
author | Tejun Heo <tj@kernel.org> | 2011-02-21 11:43:56 +0300 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-02-21 11:43:56 +0300 |
commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /arch/m68knommu/lib/Makefile | |
parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
download | linux-43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81.tar.xz |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'arch/m68knommu/lib/Makefile')
-rw-r--r-- | arch/m68knommu/lib/Makefile | 2 |
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 |