diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-14 02:49:06 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-14 02:49:06 +0400 |
| commit | 7217cbccbd0c620a6d234ebbe5e58d46d2188d0e (patch) | |
| tree | ed8ad2161ca664c9100cb3fc1f9b0d8c3762500c /include/linux/string.h | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | c931488cc4619eecfe68a2f046b5898fddc2f904 (diff) | |
| download | linux-7217cbccbd0c620a6d234ebbe5e58d46d2188d0e.tar.xz | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index dab2652acbd8..369be3264a55 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -88,7 +88,7 @@ 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); +extern char *kstrdup(const char *s, gfp_t gfp); #ifdef __cplusplus } |