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/sparc | |
| 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/sparc')
| -rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2668b3142fa2..03a1bc3c3dde 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -77,6 +77,7 @@ config SPARC64 select ARCH_HAVE_NMI_SAFE_CMPXCHG select HAVE_C_RECORDMCOUNT select NO_BOOTMEM + select ARCH_SUPPORTS_ATOMIC_RMW config ARCH_DEFCONFIG string |