summaryrefslogtreecommitdiff
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2011-12-01 12:14:48 +0200
committerLuciano Coelho <coelho@ti.com>2011-12-01 12:14:48 +0200
commite4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch)
treef69f424f731b89a75f881967903ff2f38f4b6a92 /include/linux/string.h
parentb693289406f0b8ca70ab77e745be6196d5740eb0 (diff)
parentba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h1
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);