diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
| commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
| tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /lib/string.c | |
| parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
| parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/string.c b/lib/string.c index 037a48acedbb..b3c28a3f6332 100644 --- a/lib/string.c +++ b/lib/string.c | |||
| @@ -403,7 +403,6 @@ char *strpbrk(const char *cs, const char *ct) | |||
| 403 | } | 403 | } |
| 404 | return NULL; | 404 | return NULL; |
| 405 | } | 405 | } |
| 406 | EXPORT_SYMBOL(strpbrk); | ||
| 407 | #endif | 406 | #endif |
| 408 | 407 | ||
| 409 | #ifndef __HAVE_ARCH_STRSEP | 408 | #ifndef __HAVE_ARCH_STRSEP |