kobject: remove struct kobj_type from struct kset

[karo-tx-linux.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index b28a8acae34d7082dcb52519f1ebb927a2e1c9ae..9e42f5f705b210a3c3a2b4e762385134ac565486 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -315,13 +315,13 @@ void securityfs_remove(struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(securityfs_remove);
 
-static decl_subsys(security, NULL, NULL);
+static decl_subsys(security, NULL);
 
 static int __init securityfs_init(void)
 {
        int retval;
 
-       kobj_set_kset_s(&security_subsys, kernel_subsys);
+       security_subsys.kobj.kset = &kernel_subsys;
        retval = subsystem_register(&security_subsys);
        if (retval)
                return retval;