Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[mirror_ubuntu-zesty-kernel.git] / fs / hpfs / hpfs_fn.h

diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h
index c07ef1f1ced60a0cf295772a218575d9c78e58d1..ac1ead194db5ebf2ea8d5f1ef2102033615d08a9 100644 (file)
--- a/fs/hpfs/hpfs_fn.h
+++ b/fs/hpfs/hpfs_fn.h
@@ -220,7 +220,7 @@ extern const struct dentry_operations hpfs_dentry_operations;
 
 /* dir.c */
 
-struct dentry *hpfs_lookup(struct inode *, struct dentry *, struct nameidata *);
+struct dentry *hpfs_lookup(struct inode *, struct dentry *, unsigned int);
 extern const struct file_operations hpfs_dir_ops;
 
 /* dnode.c */