Scheduled for removal: strnicmp() which is unused

diff --git a/CHANGELOG b/CHANGELOG
index 561558d0efa9f4b241e6dd87a24279688126ed8c..74ef7202ceeb3ca191775c41fa8054ace416fc42 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 1a45fd3215c89a25a9085301b0166a7e1e9705ac..62390399b0b1b7e160001abd437fd2020bfee808 100644 (file)
--- 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 0e99d1b2b50cc9200da6dc49de3a35a858490a90..e0b793abbee5106e5614f51f7876fd1e6be1d5e5 100644 (file)
--- 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