Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux

[mv-sheeva.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 7e468263f2dec91cbfd68662179187605f527e11..95a6599a37bb3ae0737779d16d9a0d811d5bfc82 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -27,7 +27,7 @@ static int cap_quota_on(struct dentry *dentry)
        return 0;
 }
 
-static int cap_bprm_check_security (struct linux_binprm *bprm)
+static int cap_bprm_check_security(struct linux_binprm *bprm)
 {
        return 0;
 }
@@ -268,8 +268,7 @@ static int cap_path_rename(struct path *old_path, struct dentry *old_dentry,
        return 0;
 }
 
-static int cap_path_truncate(struct path *path, loff_t length,
-                            unsigned int time_attrs)
+static int cap_path_truncate(struct path *path)
 {
        return 0;
 }