bci: some more code for testing

[pandora-kernel.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index 7ef1107..22f8456 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -6,16 +6,14 @@ 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)
+# always enable default capabilities
 obj-y          += commoncap.o
-endif
 
 # Object file lists
-obj-$(CONFIG_SECURITY)                 += security.o dummy.o inode.o
+obj-$(CONFIG_SECURITY)                 += security.o capability.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_SMACK)           += smack/built-in.o
+obj-$(CONFIG_SECURITY_ROOTPLUG)                += root_plug.o
+obj-$(CONFIG_SECURITY_LOWMEM)          += commoncap.o lowmem.o
 obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o