diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 14:32:24 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 14:32:24 -0700 |
commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /arch/cris/arch-v32/lib/Makefile | |
parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
download | op-kernel-dev-a348a7e6fdbcd2d5192a09719a479bb238fde727.zip op-kernel-dev-a348a7e6fdbcd2d5192a09719a479bb238fde727.tar.gz |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'arch/cris/arch-v32/lib/Makefile')
-rw-r--r-- | arch/cris/arch-v32/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/lib/Makefile b/arch/cris/arch-v32/lib/Makefile index eb4aad1..dd296b9 100644 --- a/arch/cris/arch-v32/lib/Makefile +++ b/arch/cris/arch-v32/lib/Makefile @@ -3,5 +3,5 @@ # lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o \ - csumcpfruser.o spinlock.o delay.o + csumcpfruser.o spinlock.o delay.o strcmp.o |