diff --git a/[refs] b/[refs]
index d5a50dc8fd5a..230ac405fb0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2
+refs/heads/master: 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index 9dc2346627b4..d4a9ce6e2760 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -197,8 +197,6 @@ typedef u64 resource_size_t;
 typedef u32 resource_size_t;
 #endif
 
-#endif	/* __KERNEL__ */
-
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;
@@ -206,4 +204,6 @@ struct ustat {
 	char			f_fpack[6];
 };
 
+#endif	/* __KERNEL__ */
+
 #endif /* _LINUX_TYPES_H */