summaryrefslogtreecommitdiffstats
path: root/security/keys/encrypted-keys/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-06 15:23:35 +0100
committerArnd Bergmann <arnd@arndb.de>2011-12-06 15:23:35 +0100
commit3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch)
treee687c88b1b66ad51a6a6c529f7f328f2d3b625fa /security/keys/encrypted-keys/Makefile
parentMerge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers (diff)
parentARM: mx28evk: set a initial clock rate for saif (diff)
downloadlinux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz
linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.zip
Merge branch 'mxs/saif' into next/drivers
Conflicts: drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'security/keys/encrypted-keys/Makefile')
-rw-r--r--security/keys/encrypted-keys/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile
index 6bc7a86d1027..d6f8433250a5 100644
--- a/security/keys/encrypted-keys/Makefile
+++ b/security/keys/encrypted-keys/Makefile
@@ -2,5 +2,9 @@
# Makefile for encrypted keys
#
-obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o
-obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys.o
+
+encrypted-keys-y := encrypted.o ecryptfs_format.o
+masterkey-$(CONFIG_TRUSTED_KEYS) := masterkey_trusted.o
+masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS) := masterkey_trusted.o
+encrypted-keys-y += $(masterkey-y) $(masterkey-m-m)