diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 11:19:20 -0500 |
| commit | 68556ca1e03d6a35be3b315eba58df2f8176e3a0 (patch) | |
| tree | 36a390d29a0d03a59a90c0f223b0d98a80f0f6c3 /security/keys/encrypted-keys/Makefile | |
| parent | 0604ca48f1689ad06144b81f5c08f297b6edd831 (diff) | |
| parent | 8ab30691826fc05efa47c4ffba19b80496bb3a2c (diff) | |
Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3
Diffstat (limited to 'security/keys/encrypted-keys/Makefile')
| -rw-r--r-- | security/keys/encrypted-keys/Makefile | 8 |
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 @@ | |||
| 2 | # Makefile for encrypted keys | 2 | # Makefile for encrypted keys |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o | 5 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys.o |
| 6 | obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.o | 6 | |
| 7 | encrypted-keys-y := encrypted.o ecryptfs_format.o | ||
| 8 | masterkey-$(CONFIG_TRUSTED_KEYS) := masterkey_trusted.o | ||
| 9 | masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS) := masterkey_trusted.o | ||
| 10 | encrypted-keys-y += $(masterkey-y) $(masterkey-m-m) | ||