diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 10:48:45 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 10:48:58 +0300 |
commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /arch/arm64/Kconfig | |
parent | 3906a13a6b4e78fbc0def03a808f091f0dff1b44 (diff) | |
parent | fe82203b63e598c34d96e846dea49679a726fc7a (diff) | |
download | linux-c69f203df3e61414fbf1a66d130abfd7c3bf3fd0.tar.xz |
Merge branch 'linus' into perf/core, 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, 4 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 8c7c244247b6..3741859765cf 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1073,6 +1073,10 @@ 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" |