diff --git a/[refs] b/[refs]
index 7f957839f63c..69b75a8f0306 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcca3fec9f6436dae8693e38cc69c241ea0860cd
+refs/heads/master: 4f45ba3d101fd882ed122059e6797786c81e2c17
diff --git a/trunk/fs/minix/bitmap.c b/trunk/fs/minix/bitmap.c
index ef175cb8cfd8..4bc50dac8e97 100644
--- a/trunk/fs/minix/bitmap.c
+++ b/trunk/fs/minix/bitmap.c
@@ -209,7 +209,7 @@ void minix_free_inode(struct inode * inode)
 	mark_buffer_dirty(bh);
 }
 
-struct inode *minix_new_inode(const struct inode *dir, int mode, int *error)
+struct inode *minix_new_inode(const struct inode *dir, umode_t mode, int *error)
 {
 	struct super_block *sb = dir->i_sb;
 	struct minix_sb_info *sbi = minix_sb(sb);
diff --git a/trunk/fs/minix/minix.h b/trunk/fs/minix/minix.h
index 26bbd55e82ea..c889ef0aa571 100644
--- a/trunk/fs/minix/minix.h
+++ b/trunk/fs/minix/minix.h
@@ -46,7 +46,7 @@ struct minix_sb_info {
 extern struct inode *minix_iget(struct super_block *, unsigned long);
 extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
 extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
-extern struct inode * minix_new_inode(const struct inode *, int, int *);
+extern struct inode * minix_new_inode(const struct inode *, umode_t, int *);
 extern void minix_free_inode(struct inode * inode);
 extern unsigned long minix_count_free_inodes(struct super_block *sb);
 extern int minix_new_block(struct inode * inode);