Merge branch 'master' into upstream

[powerpc.git] / include / asm-arm / stat.h

diff --git a/include/asm-arm/stat.h b/include/asm-arm/stat.h
index ca8e7a8..42c0c13 100644 (file)
--- a/include/asm-arm/stat.h
+++ b/include/asm-arm/stat.h
@@ -70,14 +70,7 @@ struct stat64 {
 
        long long       st_size;
        unsigned long   st_blksize;
-
-#if defined(__ARMEB__)
-       unsigned long   __pad4;         /* Future possible st_blocks hi bits */
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-#else /* Must be little */
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* Future possible st_blocks hi bits */
-#endif
+       unsigned long long st_blocks;   /* Number 512-byte blocks allocated. */
 
        unsigned long   st_atime;
        unsigned long   st_atime_nsec;