Merge git://oss.sgi.com:8090/xfs-2.6

[linux-2.6] / include / asm-s390 / types.h

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index d0be3e477013de865a513c84096753eb9b1e6bfb..ae2951cc83aca1cc634d4b6ab7d56694779da41d 100644 (file)
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -58,7 +58,6 @@ typedef __signed__ long saddr_t;
 
 #ifndef __ASSEMBLY__
 
-#include <linux/config.h>
 
 typedef signed char s8;
 typedef unsigned char u8;
@@ -93,6 +92,11 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#define HAVE_BLKCNT_T
+#endif
+
 #endif /* ! __s390x__   */
 #endif /* __ASSEMBLY__  */
 #endif /* __KERNEL__    */