Merge remote-tracking branch 'selinux/next'

[deliverable/linux.git] / include / linux / security.h

diff --git a/include/linux/security.h b/include/linux/security.h
index a6c6d5d0fa5d6f903bc907a1b8ab64e0fd02337d..c2125e9093e8e51b51662ba8ce4a5faa767710b6 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -313,7 +313,6 @@ void security_transfer_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
 int security_kernel_module_request(char *kmod_name);
-int security_kernel_module_from_file(struct file *file);
 int security_kernel_read_file(struct file *file, enum kernel_read_file_id id);
 int security_kernel_post_read_file(struct file *file, char *buf, loff_t size,
                                   enum kernel_read_file_id id);