Merge commit 'wd/master'

[u-boot] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index 403ae982beb248e53356c8f16b5e4f5d3c5358cb..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
@@ -59,7 +59,7 @@ extern __kernel_size_t strnlen(const char *,__kernel_size_t);
 #ifndef __HAVE_ARCH_STRDUP
 extern char * strdup(const char *);
 #endif
-#ifdef __HAVE_ARCH_STRSWAB
+#ifndef __HAVE_ARCH_STRSWAB
 extern char * strswab(const char *);
 #endif