Auto merge with /home/aegl/GIT/linus

[linux-2.6] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index b9fc59469956368dd3cfa323f0fd45e9fe7ae55b..dab2652acbd8354a5f19745d6d1cac4ad7500ea0 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -88,6 +88,8 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
 extern void * memchr(const void *,int,__kernel_size_t);
 #endif
 
+extern char *kstrdup(const char *s, unsigned int __nocast gfp);
+
 #ifdef __cplusplus
 }
 #endif