Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 070dd46f62f4f57c7262211352775e121439e8a2..bdf22034a96118de3833f1913b0a89e8c617c7c4 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -225,7 +225,7 @@ static int cap_inode_setattr(struct dentry *dentry, struct iattr *iattr)
        return 0;
 }
 
-static int cap_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
+static int cap_inode_getattr(const struct path *path)
 {
        return 0;
 }