X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-s390%2Ftypes.h;h=d0be3e477013de865a513c84096753eb9b1e6bfb;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=ae2951cc83aca1cc634d4b6ab7d56694779da41d;hpb=3944158a6d33f94668dbd6bdc32ff5c67bb53ec2;p=linux-2.6.git

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index ae2951cc8..d0be3e477 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -58,6 +58,7 @@ typedef __signed__ long saddr_t;
 
 #ifndef __ASSEMBLY__
 
+#include <linux/config.h>
 
 typedef signed char s8;
 typedef unsigned char u8;
@@ -92,11 +93,6 @@ 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__    */