diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /arch/powerpc/Kconfig | |
| parent | 26179670a68b7b365fbfe38afb043dcd2e1a4678 (diff) | |
| parent | 8d829b9bb878904f3419af8003176a12910b94e8 (diff) | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e07735a690c6..6189238e69f8 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1199,11 +1199,6 @@ source "arch/powerpc/Kconfig.debug" source "security/Kconfig" -config KEYS_COMPAT - bool - depends on COMPAT && KEYS - default y - source "crypto/Kconfig" config PPC_LIB_RHEAP |