diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /lib/string.c | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
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 |