diff --git a/[refs] b/[refs]
index 189abdbcb052..95a32d39c932 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b98a5857c3fa86cb0a7e5f893643491a8b5b425
+refs/heads/master: 5dbe3040c74eef18e66951347eda05b153e69328
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index a14c2d4b22cf..19d8e04e1688 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -1660,6 +1660,8 @@ struct security_operations {
 extern int security_init(void);
 extern int security_module_enable(struct security_operations *ops);
 extern int register_security(struct security_operations *ops);
+extern void __init security_fixup_ops(struct security_operations *ops);
+
 
 /* Security operations */
 int security_ptrace_access_check(struct task_struct *child, unsigned int mode);
diff --git a/trunk/security/security.c b/trunk/security/security.c
index a6328421a055..9ebda054a333 100644
--- a/trunk/security/security.c
+++ b/trunk/security/security.c
@@ -26,9 +26,6 @@
 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
 	CONFIG_DEFAULT_SECURITY;
 
-/* things that live in capability.c */
-extern void __init security_fixup_ops(struct security_operations *ops);
-
 static struct security_operations *security_ops;
 static struct security_operations default_security_ops = {
 	.name	= "default",