Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

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

diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
index c4dc126c56211cac02e2b92c06b4151cc555bf73..488552f43b2a17bf866168f8636d91d1fa14d448 100644 (file)
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -58,7 +58,10 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-typedef unsigned int kmem_bufctl_t;
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#define HAVE_BLKCNT_T
+#endif
 
 #endif /* __ASSEMBLY__ */