X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=security%2FMakefile;h=c9bfbc84ff50d96e68adac140d5fb1269d50f4e7;hb=0c268bf997b923a166381601380d2af36a66c189;hp=39dbfa5879956a57c370ee986cb41bc8cce484ca;hpb=f40cf81b65d1431e358991b06a79da0b0ff1b0b4;p=firefly-linux-kernel-4.4.55.git

diff --git a/security/Makefile b/security/Makefile
index 39dbfa587995..c9bfbc84ff50 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -14,20 +14,16 @@ obj-y					+= commoncap.o
 obj-$(CONFIG_MMU)			+= min_addr.o
 
 # Object file lists
-obj-$(CONFIG_SECURITY)			+= security.o capability.o
+obj-$(CONFIG_SECURITY)			+= security.o
 obj-$(CONFIG_SECURITYFS)		+= inode.o
-# Must precede capability.o in order to stack properly.
-obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
-obj-$(CONFIG_SECURITY_SMACK)		+= smack/built-in.o
+obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/
+obj-$(CONFIG_SECURITY_SMACK)		+= smack/
 obj-$(CONFIG_AUDIT)			+= lsm_audit.o
-obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o
-obj-$(CONFIG_SECURITY_APPARMOR)		+= apparmor/built-in.o
-obj-$(CONFIG_SECURITY_YAMA)		+= yama/built-in.o
+obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/
+obj-$(CONFIG_SECURITY_APPARMOR)		+= apparmor/
+obj-$(CONFIG_SECURITY_YAMA)		+= yama/
 obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o
 
 # Object integrity file lists
 subdir-$(CONFIG_INTEGRITY)		+= integrity
-obj-$(CONFIG_INTEGRITY)			+= integrity/built-in.o
-
-obj-y					+= tlk_driver/
-obj-y					+= optee_linuxdriver/
+obj-$(CONFIG_INTEGRITY)			+= integrity/