diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-04 06:12:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-04 06:12:08 -0500 |
| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 (patch) | |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f /arch/m32r | |
| parent | 4650bac1fc45d64aef62ab99aa4db93d41dedbd9 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 836ac5a963c8..2841c0a3fd3b 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -276,6 +276,7 @@ source "kernel/Kconfig.preempt" | |||
| 276 | 276 | ||
| 277 | config SMP | 277 | config SMP |
| 278 | bool "Symmetric multi-processing support" | 278 | bool "Symmetric multi-processing support" |
| 279 | depends on MMU | ||
| 279 | ---help--- | 280 | ---help--- |
| 280 | This enables support for systems with more than one CPU. If you have | 281 | This enables support for systems with more than one CPU. If you have |
| 281 | a system with only one CPU, say N. If you have a system with more | 282 | a system with only one CPU, say N. If you have a system with more |