diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/linux/string.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
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 c61306da8c52..e4c755860316 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
| @@ -56,6 +56,7 @@ extern char * strnchr(const char *, size_t, int); | |||
| 56 | #ifndef __HAVE_ARCH_STRRCHR | 56 | #ifndef __HAVE_ARCH_STRRCHR |
| 57 | extern char * strrchr(const char *,int); | 57 | extern char * strrchr(const char *,int); |
| 58 | #endif | 58 | #endif |
| 59 | extern char * strstrip(char *); | ||
| 59 | #ifndef __HAVE_ARCH_STRSTR | 60 | #ifndef __HAVE_ARCH_STRSTR |
| 60 | extern char * strstr(const char *,const char *); | 61 | extern char * strstr(const char *,const char *); |
| 61 | #endif | 62 | #endif |