diff options
| author | 2011-11-08 10:47:46 +0000 | |
|---|---|---|
| committer | 2011-11-08 10:47:46 +0000 | |
| commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
| tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/linux/string.h | |
| parent | Merge branch 'for-3.2' into for-3.3 (diff) | |
| parent | Merge branch 'for-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.2 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index a176db2f2c85..e033564f10ba 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -114,6 +114,7 @@ extern int memcmp(const void *,const void *,__kernel_size_t); #ifndef __HAVE_ARCH_MEMCHR extern void * memchr(const void *,int,__kernel_size_t); #endif +void *memchr_inv(const void *s, int c, size_t n); extern char *kstrdup(const char *s, gfp_t gfp); extern char *kstrndup(const char *s, size_t len, gfp_t gfp); |
