Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/include/linux/types.h b/include/linux/types.h
index 9dc2346627b4b5c6c825dc09143041a66d22c092..f24f7beb47df0bcad9a481f6b14b83df34d12a1a 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -191,13 +191,13 @@ typedef __u32 __bitwise __wsum;
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
 
-#ifdef CONFIG_RESOURCES_64BIT
-typedef u64 resource_size_t;
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+typedef u64 phys_addr_t;
 #else
-typedef u32 resource_size_t;
+typedef u32 phys_addr_t;
 #endif
 
-#endif /* __KERNEL__ */
+typedef phys_addr_t resource_size_t;
 
 struct ustat {
        __kernel_daddr_t        f_tfree;
@@ -206,4 +206,6 @@ struct ustat {
        char                    f_fpack[6];
 };
 
+#endif /* __KERNEL__ */
+
 #endif /* _LINUX_TYPES_H */