Merge commit 'v2.6.30' into for-2.6.31

[safe/jmp/linux-2.6] / security / root_plug.c

diff --git a/security/root_plug.c b/security/root_plug.c
index 559578f..40fb4f1 100644 (file)
--- a/security/root_plug.c
+++ b/security/root_plug.c
@@ -77,7 +77,6 @@ static struct security_operations rootplug_security_ops = {
        .capget =                       cap_capget,
        .capset =                       cap_capset,
        .capable =                      cap_capable,
-       .task_capable =                 cap_task_capable,
 
        .bprm_set_creds =               cap_bprm_set_creds,