diff options
author | James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
commit | 88a1b564a20e371e6be41b39b85673e9c1959491 (patch) | |
tree | f70850f5242470d479711ddb816ac05f47b15642 /arch/mips/configs/rm200_defconfig | |
parent | 5804602536649bccc907cbdd7e31b8797bdb6c45 (diff) | |
parent | 4e8ae72a75aae285ec5b93518b9680da198afd0d (diff) | |
download | linux-stable-88a1b564a20e371e6be41b39b85673e9c1959491.tar.gz linux-stable-88a1b564a20e371e6be41b39b85673e9c1959491.tar.bz2 linux-stable-88a1b564a20e371e6be41b39b85673e9c1959491.zip |
Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'arch/mips/configs/rm200_defconfig')
-rw-r--r-- | arch/mips/configs/rm200_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index db029f4ff759..82db4e3e4cf1 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -453,7 +453,6 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m -CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m |