diff options
| author | Ingo Molnar | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /arch/arm64/Kconfig | |
| parent | x86/boot/64: Put __startup_64() into .head.text (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| download | kernel-qcow2-linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.gz kernel-qcow2-linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.xz kernel-qcow2-linux-a4eb8b993554d374002663200bf5721f7f2ee259.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a7c5f8c3f13d..95c7ed392003 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1084,10 +1084,6 @@ config SYSVIPC_COMPAT def_bool y depends on COMPAT && SYSVIPC -config KEYS_COMPAT - def_bool y - depends on COMPAT && KEYS - endmenu menu "Power management options" |