projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus
[linux.git]
/
arch
/
arm
/
lib
/
Makefile
diff --git
a/arch/arm/lib/Makefile
b/arch/arm/lib/Makefile
index 992769ae2599f1f5c050847311fabd789d308c52..2473fd1fd51cfa50ef02985e6e8d83c5f97119c8 100644
(file)
--- a/
arch/arm/lib/Makefile
+++ b/
arch/arm/lib/Makefile
@@
-6,9
+6,8
@@
lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \
csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \
csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
- delay.o
findbit.o memchr.o memcpy.o
\
+ delay.o
delay-loop.o findbit.o memchr.o memcpy.o
\
memmove.o memset.o memzero.o setbit.o \
memmove.o memset.o memzero.o setbit.o \
- strncpy_from_user.o strnlen_user.o \
strchr.o strrchr.o \
testchangebit.o testclearbit.o testsetbit.o \
ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
strchr.o strrchr.o \
testchangebit.o testclearbit.o testsetbit.o \
ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \