Merge branch 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6

[pandora-kernel.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 2984ea4..bbb5115 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -181,7 +181,7 @@ static int cap_inode_follow_link(struct dentry *dentry,
        return 0;
 }
 
-static int cap_inode_permission(struct inode *inode, int mask)
+static int cap_inode_permission(struct inode *inode, int mask, unsigned flags)
 {
        return 0;
 }