summaryrefslogtreecommitdiffstats
path: root/arch/sh/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-06-20 18:29:27 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-06-20 18:29:27 +0900
commit70876facfa9bb6596e4c09e9ed6b8f26d0bcba51 (patch)
tree05ebd850c3061a5e923d1ee8ef6c72b68805983b /arch/sh/Kconfig
parentb2309d684078f2be1d5db6ceabc99c51f9af3b6b (diff)
parent2b1bd1ac5d4bffe3fd542bfe1784a583bd7df4fa (diff)
downloadblackbird-op-linux-70876facfa9bb6596e4c09e9ed6b8f26d0bcba51.tar.gz
blackbird-op-linux-70876facfa9bb6596e4c09e9ed6b8f26d0bcba51.zip
Merge branch 'x3'
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r--arch/sh/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 924efe5b8c29..d8ed6676ae86 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -554,6 +554,7 @@ config NR_CPUS
int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP
+ default "4" if CPU_SHX3
default "2"
help
This allows you to specify the maximum number of CPUs which this
OpenPOWER on IntegriCloud