diff options
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | include/linux/string.h | 2 | ||||
| -rw-r--r-- | lib_generic/string.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -2,6 +2,12 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Scheduled for removal: strnicmp() which is unused + +* Update for Intel Monahans boards: + - support for magic key detection and handling on delta board + - NAND support for zylonite board + some minor cleanup + * Declare load_serial_ymodem() when using CFG_CMD_LOADB. Patch by Jon Loeliger, 01. May 2006 diff --git a/include/linux/string.h b/include/linux/string.h index 1a45fd3215..62390399b0 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -38,7 +38,7 @@ extern int strcmp(const char *,const char *); #ifndef __HAVE_ARCH_STRNCMP extern int strncmp(const char *,const char *,__kernel_size_t); #endif -#ifndef __HAVE_ARCH_STRNICMP +#if 0 /* not used - was: #ifndef __HAVE_ARCH_STRNICMP */ extern int strnicmp(const char *, const char *, __kernel_size_t); #endif #ifndef __HAVE_ARCH_STRCHR diff --git a/lib_generic/string.c b/lib_generic/string.c index 0e99d1b2b5..e0b793abbe 100644 --- a/lib_generic/string.c +++ b/lib_generic/string.c @@ -21,7 +21,7 @@ #include <malloc.h> -#ifndef __HAVE_ARCH_STRNICMP +#if 0 /* not used - was: #ifndef __HAVE_ARCH_STRNICMP */ /** * strnicmp - Case insensitive, length-limited string comparison * @s1: One string |