diff -urN ../linux-2.6.19-orig/include/linux/types.h include/linux/types.h
--- ../linux-2.6.19-orig/include/linux/types.h	2006-11-30 06:57:37 +0900
+++ include/linux/types.h	2007-11-19 14:15:56 +0900
@@ -146,6 +146,8 @@
 typedef unsigned long blkcnt_t;
 #endif
 
+#endif /* __KERNEL_STRICT_NAMES */
+
 /*
  * The type of an index into the pagecache.  Use a #define so asm/types.h
  * can override it.
@@ -154,8 +156,6 @@
 #define pgoff_t unsigned long
 #endif
 
-#endif /* __KERNEL_STRICT_NAMES */
-
 /*
  * Below are truly Linux-specific types that should never collide with
  * any application/library that wants linux/types.h.