Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen

[~andy/linux] / fs / isofs / isofs.h

diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index 7d33de84f52adec9b647bfc23f883f811f939ca9..0e73f63d92745d244a7007b3d1b367784d467c58 100644 (file)
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -50,14 +50,14 @@ struct isofs_sb_info {
        unsigned int  s_uid_set:1;
        unsigned int  s_gid_set:1;
 
-       mode_t s_fmode;
-       mode_t s_dmode;
+       umode_t s_fmode;
+       umode_t s_dmode;
        gid_t s_gid;
        uid_t s_uid;
        struct nls_table *s_nls_iocharset; /* Native language support table */
 };
 
-#define ISOFS_INVALID_MODE ((mode_t) -1)
+#define ISOFS_INVALID_MODE ((umode_t) -1)
 
 static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb)
 {