diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /arch/powerpc/Kconfig | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index bb2efdd566a9..db93dbc0e21a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -227,7 +227,7 @@ config SMP | |||
| 227 | If you don't know what to do here, say N. | 227 | If you don't know what to do here, say N. |
| 228 | 228 | ||
| 229 | config NR_CPUS | 229 | config NR_CPUS |
| 230 | int "Maximum number of CPUs (2-32)" | 230 | int "Maximum number of CPUs (2-128)" |
| 231 | range 2 128 | 231 | range 2 128 |
| 232 | depends on SMP | 232 | depends on SMP |
| 233 | default "32" if PPC64 | 233 | default "32" if PPC64 |