From 55cb5fc9d04cac686e296963d29293741d521281 Mon Sep 17 00:00:00 2001
From: maximilian attems <max@stro.at>
Date: Fri, 23 May 2008 13:04:29 -0700
Subject: [PATCH] --- yaml --- r: 97247 b: refs/heads/master c:
 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 h: refs/heads/master i:   97245:
 3940b67469a50d896e008627df6acfc241900853   97243:
 99c158fb17f37df7ab028485c2f0332f73db8dc0   97239:
 d6b4224d7f3dfb97b3019240cc6d337d9a8bf4f2   97231:
 b83f93a72537b33e1c9ec8a43332b57f184c5cda   97215:
 f4d11573541b5b15c4c1e82ebfd5438b1ac2a4df v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/types.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 */