diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /include/asm-sh/string.h | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-sh/string.h')
| -rw-r--r-- | include/asm-sh/string.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-sh/string.h b/include/asm-sh/string.h index 95bc7db006b0..55f8db6bc1d7 100644 --- a/include/asm-sh/string.h +++ b/include/asm-sh/string.h | |||
| @@ -126,9 +126,6 @@ extern void *memchr(const void *__s, int __c, size_t __n); | |||
| 126 | #define __HAVE_ARCH_STRLEN | 126 | #define __HAVE_ARCH_STRLEN |
| 127 | extern size_t strlen(const char *); | 127 | extern size_t strlen(const char *); |
| 128 | 128 | ||
| 129 | /* arch/sh/lib/strcasecmp.c */ | ||
| 130 | extern int strcasecmp(const char *, const char *); | ||
| 131 | |||
| 132 | #endif /* __KERNEL__ */ | 129 | #endif /* __KERNEL__ */ |
| 133 | 130 | ||
| 134 | #endif /* __ASM_SH_STRING_H */ | 131 | #endif /* __ASM_SH_STRING_H */ |