Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / include / linux / reiserfs_acl.h

diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index a57e973af0bd022cce7bf44cef7842d4303e9839..0760507a545bb5fdb93d2806bca81d8bdaa725c8 100644 (file)
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -1,22 +1,21 @@
 #include <linux/init.h>
 #include <linux/posix_acl.h>
-#include <linux/xattr_acl.h>
 
 #define REISERFS_ACL_VERSION   0x0001
 
 typedef struct {
-       __u16           e_tag;
-       __u16           e_perm;
-       __u32           e_id;
+       __le16          e_tag;
+       __le16          e_perm;
+       __le32          e_id;
 } reiserfs_acl_entry;
 
 typedef struct {
-       __u16           e_tag;
-       __u16           e_perm;
+       __le16          e_tag;
+       __le16          e_perm;
 } reiserfs_acl_entry_short;
 
 typedef struct {
-       __u32           a_version;
+       __le32          a_version;
 } reiserfs_acl_header;
 
 static inline size_t reiserfs_acl_size(int count)