Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index d156d81..8cbbf2f 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -2,16 +2,18 @@
 # 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
-obj-$(CONFIG_SECURITY)                 += security.o dummy.o
+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_CAPABILITIES)    += commoncap.o capability.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
+obj-$(CONFIG_SECURITY_SECLVL)          += seclvl.o