Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / ramfs.h

diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 8600508c77a6e541ad30b54e152dd057f5cb6fc7..e7320b5e82fb4ac956f1cd0951488ddf1bc44637 100644 (file)
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -1,7 +1,8 @@
 #ifndef _LINUX_RAMFS_H
 #define _LINUX_RAMFS_H
 
-struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev);
+struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
+        int mode, dev_t dev);
 extern int ramfs_get_sb(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data, struct vfsmount *mnt);