diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:34:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:34:19 +0800 |
| commit | 77917ecac9c37f9f02e7954b617df8f824894778 (patch) | |
| tree | f66f255d84847a55722f4a608dc429baf3c5e43b /arch/arm64/Kconfig | |
| parent | 4a9948e4921af4c4b6a9f1120b9a05122957d09d (diff) | |
| parent | 92488f4c9f687cc0e274be561f7b168743f59f20 (diff) | |
Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/Kconfig
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 4fd9e56ef652..3a8bfb12f726 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -4,6 +4,7 @@ config ARM64 select ARCH_USE_CMPXCHG_LOCKREF select ARCH_HAS_OPP select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST + select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS |