Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / security / keys / internal.h

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 3c2877f0663ebc6f60d5a9585ff985df52a502f5..1bb416f4bbcef7aa9315e9efcb59d292389ee8b2 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -99,6 +99,7 @@ extern int install_process_keyring(struct task_struct *tsk);
 extern struct key *request_key_and_link(struct key_type *type,
                                        const char *description,
                                        const char *callout_info,
+                                       void *aux,
                                        struct key *dest_keyring,
                                        unsigned long flags);