diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-04-18 07:37:51 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-04-18 07:37:51 +1000 |
| commit | 30a83251dd8b7e3566be9ea8c4921bafc21bee8f (patch) | |
| tree | 1d86ec5f4e8aaeea0cf9c5a5c19003e6cd0730a8 /security/keys/Makefile | |
| parent | 622f6e3265707ebf02ba776ac6e68003bcc31213 (diff) | |
| parent | 4cd4ca7cc848bedc70b5d0acac9d1ae33d73513a (diff) | |
| download | linux-30a83251dd8b7e3566be9ea8c4921bafc21bee8f.tar.bz2 | |
Merge tag 'keys-next-20170412' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/Makefile')
| -rw-r--r-- | security/keys/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index 1fd4a16e6daf..57dff0c15809 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile @@ -15,7 +15,8 @@ obj-y := \ request_key.o \ request_key_auth.o \ user_defined.o -obj-$(CONFIG_KEYS_COMPAT) += compat.o +compat-obj-$(CONFIG_KEY_DH_OPERATIONS) += compat_dh.o +obj-$(CONFIG_KEYS_COMPAT) += compat.o $(compat-obj-y) obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSCTL) += sysctl.o obj-$(CONFIG_PERSISTENT_KEYRINGS) += persistent.o |