diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2011-01-14 01:33:24 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 04:00:46 -0500 |
| commit | 4d2692a736c95240100755ba98b2403e11f12e06 (patch) | |
| tree | ce2e04aaeb7c6ab946400d49feeea8386db587ae /arch/arm/Kconfig | |
| parent | 874d5d3ccc04c0659b76b05ee0c761f568062cb1 (diff) | |
ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
This depends on !XIP_KERNEL and not !XIP.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a3fb23be87f3..53ea54782ef5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1275,7 +1275,7 @@ config SMP | |||
| 1275 | config SMP_ON_UP | 1275 | config SMP_ON_UP |
| 1276 | bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" | 1276 | bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" |
| 1277 | depends on EXPERIMENTAL | 1277 | depends on EXPERIMENTAL |
| 1278 | depends on SMP && !XIP | 1278 | depends on SMP && !XIP_KERNEL |
| 1279 | default y | 1279 | default y |
| 1280 | help | 1280 | help |
| 1281 | SMP kernels contain instructions which fail on non-SMP processors. | 1281 | SMP kernels contain instructions which fail on non-SMP processors. |