aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-28 14:16:06 -0400
committerTony Luck <tony.luck@intel.com>2005-10-28 14:16:06 -0400
commit2d300fece23a4ae638b43ce9a7ac1e566ac6c843 (patch)
tree4e50fac4d14755c2206c48999c9b6fad3c920482 /arch
parentc85749e6d1df55ca5b23cb1d220ed7df92df8d78 (diff)
parent54703d3678d13e7406d0b5aa451abb9526d53b9d (diff)
Pull 1024-cpu into release branch
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 945c15a0722b..cb7fc19ff080 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -254,8 +254,8 @@ config SMP
254 If you don't know what to do here, say N. 254 If you don't know what to do here, say N.
255 255
256config NR_CPUS 256config NR_CPUS
257 int "Maximum number of CPUs (2-512)" 257 int "Maximum number of CPUs (2-1024)"
258 range 2 512 258 range 2 1024
259 depends on SMP 259 depends on SMP
260 default "64" 260 default "64"
261 help 261 help