Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / security / keys / Makefile

diff --git a/security/keys/Makefile b/security/keys/Makefile
index 74d5447d7df7259d83f54f5af5ff176fe4b5b37f..1bf090a885feed4791cab9b8a6947bde347f868e 100644 (file)
--- a/security/keys/Makefile
+++ b/security/keys/Makefile
@@ -13,6 +13,8 @@ obj-y := \
        request_key_auth.o \
        user_defined.o
 
+obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o