diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 12:59:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-10 12:59:43 +0100 |
| commit | 8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a (patch) | |
| tree | 2ad6bff3cf58c65bc33387dbf1ee50d0bacfa38d /init | |
| parent | 4a105b2f855d956b419c513e1f3212a9ac1d27f5 (diff) | |
| parent | f8ba86b7fbe99740c82a7442a0c94e7584dd02bf (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
net/wireless/nl80211.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 051ac0c6b16f..79b356f892f9 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1373,6 +1373,7 @@ config FUTEX config HAVE_FUTEX_CMPXCHG bool + depends on FUTEX help Architectures should select this if futex_atomic_cmpxchg_inatomic() is implemented and always working. This removes a couple of runtime |