diff --git a/[refs] b/[refs]
index 48e3560b458a..afd074c4aa67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 070f420b35a2c078ca2bd2a0d31dd7b5001d411c
+refs/heads/master: a1b58c237b73f10221b31e05b47a6565558207ef
diff --git a/trunk/arch/xtensa/include/asm/string.h b/trunk/arch/xtensa/include/asm/string.h
index 5fb8c27cbef5..405a8c49ff2c 100644
--- a/trunk/arch/xtensa/include/asm/string.h
+++ b/trunk/arch/xtensa/include/asm/string.h
@@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
 /* Don't build bcopy at all ...  */
 #define __HAVE_ARCH_BCOPY
 
-#define __HAVE_ARCH_MEMSCAN
-#define memscan memchr
-
 #endif	/* _XTENSA_STRING_H */