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/microblaze | |
| parent | 5804602536649bccc907cbdd7e31b8797bdb6c45 (diff) | |
| parent | 4e8ae72a75aae285ec5b93518b9680da198afd0d (diff) | |
| download | op-kernel-dev-88a1b564a20e371e6be41b39b85673e9c1959491.zip op-kernel-dev-88a1b564a20e371e6be41b39b85673e9c1959491.tar.gz | |
Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/configs/mmu_defconfig | 1 | ||||
| -rw-r--r-- | arch/microblaze/configs/nommu_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index e2f6543..dc5dd5b 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_defconfig @@ -87,5 +87,4 @@ CONFIG_KGDB_KDB=y CONFIG_EARLY_PRINTK=y CONFIG_KEYS=y CONFIG_ENCRYPTED_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index a29ebd4..4cdaf56 100644 --- a/arch/microblaze/configs/nommu_defconfig +++ b/arch/microblaze/configs/nommu_defconfig @@ -92,7 +92,6 @@ CONFIG_DEBUG_INFO=y CONFIG_EARLY_PRINTK=y CONFIG_KEYS=y CONFIG_ENCRYPTED_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y |
