Merge branch 'for-linus' of git://neil.brown.name/md

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

diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 605ebe24bb2e273ec2ba5f9f11295ef139a9a0f9..72bfefdbd7677e32c546b66a72b638c1558729a1 100644 (file)
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -1,6 +1,8 @@
 #ifndef        _CM4000_H_
 #define        _CM4000_H_
 
+#include <linux/types.h>
+
 #define        MAX_ATR                 33
 
 #define        CM4000_MAX_DEV          4
@@ -10,9 +12,9 @@
  * not to break compilation of userspace apps. -HW */
 
 typedef struct atreq {
-       int32_t atr_len;
+       __s32 atr_len;
        unsigned char atr[64];
-       int32_t power_act;
+       __s32 power_act;
        unsigned char bIFSD;
        unsigned char bIFSC;
 } atreq_t;
@@ -22,13 +24,13 @@ typedef struct atreq {
  * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
  * will lay out the structure members differently than the 64bit kernel.
  *
- * I've changed "ptsreq.protocol" from "unsigned long" to "u_int32_t".
+ * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".
  * On 32bit this will make no difference.  With 64bit kernels, it will make
  * 32bit apps work, too.
  */
 
 typedef struct ptsreq {
-       u_int32_t protocol; /*T=0: 2^0, T=1:  2^1*/
+       __u32 protocol; /*T=0: 2^0, T=1:  2^1*/
        unsigned char flags;
        unsigned char pts1;
        unsigned char pts2;