diff --git a/[refs] b/[refs]
index a0597cdd7f5b..627064af5994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4255ba3fb9275f06daffce9f458668c8bd6773e
+refs/heads/master: 34e6f9e9f9250f2b9a6da6f9df9c9293e3701c2f
diff --git a/trunk/include/asm-generic/posix_types.h b/trunk/include/asm-generic/posix_types.h
index ac83f6beb538..ac217600a9c7 100644
--- a/trunk/include/asm-generic/posix_types.h
+++ b/trunk/include/asm-generic/posix_types.h
@@ -73,6 +73,12 @@ typedef long		__kernel_ptrdiff_t;
 #endif
 #endif
 
+#ifndef __kernel_fsid_t
+typedef struct {
+	int	val[2];
+} __kernel_fsid_t;
+#endif
+
 /*
  * anything below here should be completely generic
  */
@@ -86,10 +92,6 @@ typedef char *		__kernel_caddr_t;
 typedef unsigned short	__kernel_uid16_t;
 typedef unsigned short	__kernel_gid16_t;
 
-typedef struct {
-	int	val[2];
-} __kernel_fsid_t;
-
 #ifdef __KERNEL__
 
 #undef __FD_SET