X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=arch%2Fxtensa%2Finclude%2Fasm%2Fuaccess.h;h=75bd8fbf52ba916d1a7db0567efa98ec7a3b5874;hb=4cdc4cc2ad35f92338497d53d3e8b7876cf2a51d;hp=5c9fb8005aa89827b9782433a88577e45cc32dd4;hpb=c2703b66172fff39122012e42986b44c9c6ad5f1;p=linux-2.6-microblaze.git

diff --git a/arch/xtensa/include/asm/uaccess.h b/arch/xtensa/include/asm/uaccess.h
index 5c9fb8005aa8..75bd8fbf52ba 100644
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@@ -290,8 +290,7 @@ clear_user(void __user *addr, unsigned long size)
 #define __clear_user  __xtensa_clear_user
 
 
-#ifndef CONFIG_GENERIC_STRNCPY_FROM_USER
-
+#ifdef CONFIG_ARCH_HAS_STRNCPY_FROM_USER
 extern long __strncpy_user(char *dst, const char __user *src, long count);
 
 static inline long