git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
Kconfig.cputype
diff --git
a/arch/powerpc/platforms/Kconfig.cputype
b/arch/powerpc/platforms/Kconfig.cputype
index 5fc7fac10e938515c24c6cb157a6944b746ccf2b..f7efaa925a1350f8c9e157b1c8a31d45ea34047a 100644
(file)
--- a/
arch/powerpc/platforms/Kconfig.cputype
+++ b/
arch/powerpc/platforms/Kconfig.cputype
@@
-220,8
+220,8
@@
config SMP
If you don't know what to do here, say N.
config NR_CPUS
- int "Maximum number of CPUs (2-1
28
)"
- range 2 1
28
+ int "Maximum number of CPUs (2-1
024
)"
+ range 2 1
024
depends on SMP
default "32" if PPC64
default "4"