X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=security%2FMakefile;h=7ef1107a72875412e3cdc52f48fe609f7dfbc764;hb=3b5c6b834984b09b7b7fba6a97d3a2878a4a8e42;hp=8cbbf2f3670987d47e823b11b27be3b487735698;hpb=d6d3f5bc68be3c4ab84e6f1f9db92291da671504;p=firefly-linux-kernel-4.4.55.git

diff --git a/security/Makefile b/security/Makefile
index 8cbbf2f36709..7ef1107a7287 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_KEYS)			+= keys/
 subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
+subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 
 # if we don't select a security model, use the default capabilities
 ifneq ($(CONFIG_SECURITY),y)
@@ -14,6 +15,7 @@ endif
 obj-$(CONFIG_SECURITY)			+= security.o dummy.o inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
+obj-$(CONFIG_SECURITY_SMACK)		+= commoncap.o smack/built-in.o
 obj-$(CONFIG_SECURITY_CAPABILITIES)	+= commoncap.o capability.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)		+= commoncap.o root_plug.o
-obj-$(CONFIG_SECURITY_SECLVL)		+= seclvl.o
+obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o