Merge ../linus

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

diff --git a/include/asm-h8300/types.h b/include/asm-h8300/types.h
index 21f4fc07ac0e45ae6fa9c07ce671887fdaf52eb6..da2402b8654059149e2ee9d13e777997b720731d 100644 (file)
--- a/include/asm-h8300/types.h
+++ b/include/asm-h8300/types.h
@@ -58,7 +58,8 @@ typedef u32 dma_addr_t;
 #define HAVE_SECTOR_T
 typedef u64 sector_t;
 
-typedef unsigned int kmem_bufctl_t;
+#define HAVE_BLKCNT_T
+typedef u64 blkcnt_t;
 
 #endif /* __KERNEL__ */