diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:17 +0100 |
| commit | c89c3a6acb847b03250a83cecae4f5c9ced2d960 (patch) | |
| tree | 3bf1d0aa26f5b14bfca5aece2128c73edc9f0dfa /arch/arm/mm/Kconfig | |
| parent | 7109561524dc57b95fd3f9b61547268b9b6db8ed (diff) | |
| parent | 58171bf2af6b547a560b304f6ab2b9edf1c31d5a (diff) | |
Merge branch 'swp' (early part) into for-next
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index df46620206af..577039a3f6e5 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -669,7 +669,7 @@ config ARM_VIRT_EXT details. config SWP_EMULATE - bool "Emulate SWP/SWPB instructions" + bool "Emulate SWP/SWPB instructions" if !SMP depends on CPU_V7 default y if SMP select HAVE_PROC_CPU if PROC_FS |