diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-08 12:11:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-08 12:11:52 +0800 |
| commit | be74fd2af86d551009c7a47d4884f29349d59193 (patch) | |
| tree | e6ffa4383f4b939719b9eedc685ddaf3ba3efeca /arch/arm64/Kconfig | |
| parent | 000f3de5a9866b1b3feb9ca4f66ca6a884d1d42f (diff) | |
| parent | dfb9fdffcea66d74eb9fbe4318471450242790dd (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5c74ad90a447..317ee86b5a0f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -581,6 +581,7 @@ source kernel/Kconfig.preempt source kernel/Kconfig.hz config ARCH_SUPPORTS_DEBUG_PAGEALLOC + depends on !HIBERNATION def_bool y config ARCH_HAS_HOLES_MEMORYMODEL |