diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 05:29:27 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 05:29:27 -0400 |
| commit | 70876facfa9bb6596e4c09e9ed6b8f26d0bcba51 (patch) | |
| tree | 05ebd850c3061a5e923d1ee8ef6c72b68805983b /arch/sh/Kconfig | |
| parent | b2309d684078f2be1d5db6ceabc99c51f9af3b6b (diff) | |
| parent | 2b1bd1ac5d4bffe3fd542bfe1784a583bd7df4fa (diff) | |
Merge branch 'x3'
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 1 |
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 | |||
| 554 | int "Maximum number of CPUs (2-32)" | 554 | int "Maximum number of CPUs (2-32)" |
| 555 | range 2 32 | 555 | range 2 32 |
| 556 | depends on SMP | 556 | depends on SMP |
| 557 | default "4" if CPU_SHX3 | ||
| 557 | default "2" | 558 | default "2" |
| 558 | help | 559 | help |
| 559 | This allows you to specify the maximum number of CPUs which this | 560 | This allows you to specify the maximum number of CPUs which this |