X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=security%2FMakefile;h=22f845620580dfc7c2a5f3076c8305592f0ffbbe;hp=7111cf1e0d6cd15d587745499a2d2766ee66893d;hb=5061bcd119547453b32c847d2b9490a052bc1755;hpb=7786cd7a00ae0b18923185789380a88052f4eee7

diff --git a/security/Makefile b/security/Makefile
index 7111cf1e0d6c..22f845620580 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -6,17 +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