Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[karo-tx-linux.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 8168e3ecd5bf9d43eb5b0c2b3e94636e992d7861..a0bbf30fb6dc93de4fe29da540be3533e797dede 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;
 }