This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index d156d81..197cc2f 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -2,11 +2,12 @@
 # Makefile for the kernel security code
 #
 
+obj-$(CONFIG_KEYS)                     += keys/
 subdir-$(CONFIG_SECURITY_SELINUX)      += selinux
 
 # if we don't select a security model, use the default capabilities
 ifneq ($(CONFIG_SECURITY),y)
-obj-y          += commoncap.o capability.o
+obj-y          += commoncap.o
 endif
 
 # Object file lists
@@ -15,3 +16,4 @@ obj-$(CONFIG_SECURITY)                        += security.o dummy.o
 obj-$(CONFIG_SECURITY_SELINUX)         += selinux/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