Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx...

[deliverable/linux.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index bbb51156261b723904499c81d563e5632e758bb2..2984ea4f776f0c6cd683d36eb64d096be1ebe337 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, unsigned flags)
+static int cap_inode_permission(struct inode *inode, int mask)
 {
        return 0;
 }