Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux

[linux.git] / fs / internal.h

diff --git a/fs/internal.h b/fs/internal.h
index 371bcc4b1697df808e506a6f88735209dec17dd8..916b7cbf3e3e4fae7bc831c66373b5d5ea7a3c4a 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -97,8 +97,8 @@ struct open_flags {
        int acc_mode;
        int intent;
 };
-extern struct file *do_filp_open(int dfd, const char *pathname,
-               const struct open_flags *op, int lookup_flags);
+extern struct file *do_filp_open(int dfd, struct filename *pathname,
+               const struct open_flags *op, int flags);
 extern struct file *do_file_open_root(struct dentry *, struct vfsmount *,
                const char *, const struct open_flags *, int lookup_flags);