diff --git a/[refs] b/[refs]
index 80b78274a23b..ac170cec511d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c884c1d4ac955987e84acf2d36c0f160536aca4
+refs/heads/master: 6063c0461b947c26a77674f33a3409eb99e15d2f
diff --git a/trunk/security/selinux/include/security.h b/trunk/security/selinux/include/security.h
index 8556e1a263c2..30002c43436f 100644
--- a/trunk/security/selinux/include/security.h
+++ b/trunk/security/selinux/include/security.h
@@ -217,6 +217,7 @@ struct selinux_kernel_status {
 extern void selinux_status_update_setenforce(int enforcing);
 extern void selinux_status_update_policyload(int seqno);
 extern void selinux_complete_init(void);
+extern int selinux_disable(void);
 
 #endif /* _SELINUX_SECURITY_H_ */
 
diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c
index 55d92cbb177a..d3677c6c12c6 100644
--- a/trunk/security/selinux/selinuxfs.c
+++ b/trunk/security/selinux/selinuxfs.c
@@ -278,7 +278,6 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 	char *page = NULL;
 	ssize_t length;
 	int new_value;
-	extern int selinux_disable(void);
 
 	length = -ENOMEM;
 	if (count >= PAGE_SIZE)