aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/trizeps4_defconfig
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-02-03 15:04:40 +0000
committerDavid Howells <dhowells@redhat.com>2016-02-10 10:13:27 +0000
commit50d35015ff0c00a464e35b109231145d2beec1bd (patch)
tree65b3adb01534e964eca9d8cdd49420c0e7f87c17 /arch/arm/configs/trizeps4_defconfig
parentKEYS: Add an alloc flag to convey the builtinness of a key (diff)
downloadlinux-dev-50d35015ff0c00a464e35b109231145d2beec1bd.tar.xz
linux-dev-50d35015ff0c00a464e35b109231145d2beec1bd.zip
KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option
CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option as /proc/keys is now mandatory if the keyrings facility is enabled (it's used by libkeyutils in userspace). The defconfig references were removed with: perl -p -i -e 's/CONFIG_KEYS_DEBUG_PROC_KEYS=y\n//' \ `git grep -l CONFIG_KEYS_DEBUG_PROC_KEYS=y` and the integrity Kconfig fixed by hand. Signed-off-by: David Howells <dhowells@redhat.com> cc: Andreas Ziegler <andreas.ziegler@fau.de> cc: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>
Diffstat (limited to 'arch/arm/configs/trizeps4_defconfig')
-rw-r--r--arch/arm/configs/trizeps4_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig
index 4bc870028035..0ada29d568ec 100644
--- a/arch/arm/configs/trizeps4_defconfig
+++ b/arch/arm/configs/trizeps4_defconfig
@@ -214,7 +214,6 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUG_USER=y
CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_SHA256=m