diff --git a/[refs] b/[refs]
index 0ed3f8391fa2..f87bec102a65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b9a3917366028cc451a98dd22e3bcd537d4e5c1
+refs/heads/master: 3cbb90a9cb7854b1110663919d5bc3da3f46d5e3
diff --git a/trunk/arch/powerpc/lib/strcase.c b/trunk/arch/powerpc/lib/strcase.c
index 36b521091bbc..f8ec1eba3fdd 100644
--- a/trunk/arch/powerpc/lib/strcase.c
+++ b/trunk/arch/powerpc/lib/strcase.c
@@ -1,4 +1,6 @@
+#include <linux/types.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 int strcasecmp(const char *s1, const char *s2)
 {
@@ -11,7 +13,7 @@ int strcasecmp(const char *s1, const char *s2)
 	return c1 - c2;
 }
 
-int strncasecmp(const char *s1, const char *s2, int n)
+int strncasecmp(const char *s1, const char *s2, size_t n)
 {
 	int c1, c2;
 
diff --git a/trunk/include/asm-powerpc/string.h b/trunk/include/asm-powerpc/string.h
index 8606a696c088..faa407f33c6b 100644
--- a/trunk/include/asm-powerpc/string.h
+++ b/trunk/include/asm-powerpc/string.h
@@ -15,7 +15,7 @@
 #define __HAVE_ARCH_MEMCHR
 
 extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *, const char *, int);
+extern int strncasecmp(const char *, const char *, __kernel_size_t);
 extern char * strcpy(char *,const char *);
 extern char * strncpy(char *,const char *, __kernel_size_t);
 extern __kernel_size_t strlen(const char *);