X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Ftypes.h;h=1d98330b1f2c174fa239f8dbfc0b5533b4f99dc6;hb=5579a782ad7ffa162b1060993e4a298dd50e7a33;hp=d4a9ce6e2760394a7fb29d4812e03a4728a9a555;hpb=896395c290f902576270d84291c1f7f8bfbe339d;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/types.h b/include/linux/types.h
index d4a9ce6e276..1d98330b1f2 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -190,13 +190,16 @@ typedef __u32 __bitwise __wsum;
 
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
+typedef unsigned __bitwise__ fmode_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
 
+typedef phys_addr_t resource_size_t;
+
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;