linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 775ea6a..08848a1 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -2,6 +2,7 @@
 #define _LINUX_TYPES_H
 
 #ifdef __KERNEL__
+#include <linux/config.h>
 
 #define BITS_TO_LONGS(bits) \
        (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
@@ -138,10 +139,6 @@ typedef            __s64           int64_t;
 typedef unsigned long sector_t;
 #endif
 
-#ifndef HAVE_BLKCNT_T
-typedef unsigned long blkcnt_t;
-#endif
-
 /*
  * The type of an index into the pagecache.  Use a #define so asm/types.h
  * can override it.
@@ -179,15 +176,8 @@ typedef __u64 __bitwise __be64;
 
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
-
-#ifdef CONFIG_RESOURCES_64BIT
-typedef u64 resource_size_t;
-#else
-typedef u32 resource_size_t;
 #endif
 
-#endif /* __KERNEL__ */
-
 struct ustat {
        __kernel_daddr_t        f_tfree;
        __kernel_ino_t          f_tinode;