diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /include/linux/string.h | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index ac889c5ea11b..d36977e029af 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
| @@ -52,6 +52,9 @@ extern int strncasecmp(const char *s1, const char *s2, size_t n); | |||
| 52 | #ifndef __HAVE_ARCH_STRCHR | 52 | #ifndef __HAVE_ARCH_STRCHR |
| 53 | extern char * strchr(const char *,int); | 53 | extern char * strchr(const char *,int); |
| 54 | #endif | 54 | #endif |
| 55 | #ifndef __HAVE_ARCH_STRCHRNUL | ||
| 56 | extern char * strchrnul(const char *,int); | ||
| 57 | #endif | ||
| 55 | #ifndef __HAVE_ARCH_STRNCHR | 58 | #ifndef __HAVE_ARCH_STRNCHR |
| 56 | extern char * strnchr(const char *, size_t, int); | 59 | extern char * strnchr(const char *, size_t, int); |
| 57 | #endif | 60 | #endif |