Merge branch 'next' into for-linus
[linux-3.10.git] / security / keys / Makefile
index ddb495d..1bf090a 100644 (file)
@@ -3,12 +3,18 @@
 #
 
 obj-y := \
+       gc.o \
        key.o \
        keyring.o \
        keyctl.o \
+       permission.o \
        process_keys.o \
-       user_defined.o \
-       request_key.o
+       request_key.o \
+       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