diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
| commit | 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 (patch) | |
| tree | c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 /include/linux/string.h | |
| parent | 84ac69e8bf9f36eb0166817373336d14fa58f5cc (diff) | |
| parent | aec5c3c1a929d7d79a420e943285cf3ba26a7c0d (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 369be3264a55..dee221429ad0 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
| @@ -18,6 +18,8 @@ extern char * strsep(char **,const char *); | |||
| 18 | extern __kernel_size_t strspn(const char *,const char *); | 18 | extern __kernel_size_t strspn(const char *,const char *); |
| 19 | extern __kernel_size_t strcspn(const char *,const char *); | 19 | extern __kernel_size_t strcspn(const char *,const char *); |
| 20 | 20 | ||
| 21 | extern char *strndup_user(const char __user *, long); | ||
| 22 | |||
| 21 | /* | 23 | /* |
| 22 | * Include machine specific inline routines | 24 | * Include machine specific inline routines |
| 23 | */ | 25 | */ |