aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/Makefile
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-10-09 16:04:43 -0700
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2019-12-12 23:41:17 +0200
commit601f0093f2647db67be40b62e13cd0660990a7c8 (patch)
treedbb20f2a4524bc96ce1ccaa074819cadd092a1fe /security/keys/Makefile
parentMerge tag 'ceph-for-5.5-rc2' of git://github.com/ceph/ceph-client (diff)
downloadlinux-dev-601f0093f2647db67be40b62e13cd0660990a7c8.tar.xz
linux-dev-601f0093f2647db67be40b62e13cd0660990a7c8.zip
KEYS: remove CONFIG_KEYS_COMPAT
KEYS_COMPAT now always takes the value of COMPAT && KEYS. But the security/keys/ directory is only compiled if KEYS is enabled, so in practice KEYS_COMPAT is the same as COMPAT. Therefore, remove the unnecessary KEYS_COMPAT and just use COMPAT directly. (Also remove an outdated comment from compat.c.) Reviewed-by: James Morris <jamorris@linux.microsoft.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'security/keys/Makefile')
-rw-r--r--security/keys/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile
index 074f27538f55..5f40807f05b3 100644
--- a/security/keys/Makefile
+++ b/security/keys/Makefile
@@ -17,7 +17,7 @@ obj-y := \
request_key_auth.o \
user_defined.o
compat-obj-$(CONFIG_KEY_DH_OPERATIONS) += compat_dh.o
-obj-$(CONFIG_KEYS_COMPAT) += compat.o $(compat-obj-y)
+obj-$(CONFIG_COMPAT) += compat.o $(compat-obj-y)
obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_SYSCTL) += sysctl.o
obj-$(CONFIG_PERSISTENT_KEYRINGS) += persistent.o