git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/firmware-2.6
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
lib
/
string.c
diff --git
a/arch/m68k/lib/string.c
b/arch/m68k/lib/string.c
index 891e1347bc4e4c1de3d0455d40905dce19992b08..4253f870e54fc8fe24d510bfef948c3751300a69 100644
(file)
--- a/
arch/m68k/lib/string.c
+++ b/
arch/m68k/lib/string.c
@@
-15,6
+15,12
@@
char *strcpy(char *dest, const char *src)
}
EXPORT_SYMBOL(strcpy);
+char *strcat(char *dest, const char *src)
+{
+ return __kernel_strcpy(dest + __kernel_strlen(dest), src);
+}
+EXPORT_SYMBOL(strcat);
+
void *memset(void *s, int c, size_t count)
{
void *xs = s;