colibri_imx6: boot env configuration updates

[oweals/u-boot.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 1f3cd63b8f2265545b8d6bd245b957741b3fb8fa..baa2c491ea5bd187f176dbf04d4df6f0db1a80d3 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -85,7 +85,7 @@ typedef unsigned int          u_int;
 typedef unsigned long          u_long;
 
 /* sysv */
-typedef unsigned char          unchar;
+typedef unsigned char          uchar;
 typedef unsigned short         ushort;
 typedef unsigned int           uint;
 typedef unsigned long          ulong;
@@ -151,11 +151,20 @@ typedef __u32 __bitwise __wsum;
 
 typedef unsigned __bitwise__   gfp_t;
 
+#ifdef __linux__
 struct ustat {
        __kernel_daddr_t        f_tfree;
        __kernel_ino_t          f_tinode;
        char                    f_fname[6];
        char                    f_fpack[6];
 };
+#endif
+
+#define DECLARE_BITMAP(name, bits) \
+       unsigned long name[BITS_TO_LONGS(bits)]
+
+typedef volatile unsigned long vu_long;
+typedef volatile unsigned short vu_short;
+typedef volatile unsigned char vu_char;
 
 #endif /* _LINUX_TYPES_H */