Merge branch 'fixes' into for-linus

[linux-2.6-omap-h63xx.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 451f2ffb137b53eb3ad0056fe6e7695579d3773a..48e496fe1e753102811cb4064f4da6d8f0060c4f 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -171,8 +171,8 @@ config IA64_SGI_SN2
          to select this option.  If in doubt, select ia64 generic support
          instead.
 
-config IA64_SGI_UV`
-       bool "SGI-UV`"
+config IA64_SGI_UV
+       bool "SGI-UV"
        select NUMA
        select ACPI_NUMA
        select SWIOTLB
@@ -321,10 +321,10 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-1024)"
-       range 2 1024
+       int "Maximum number of CPUs (2-4096)"
+       range 2 4096
        depends on SMP
-       default "1024"
+       default "4096"
        help
          You should set this to the number of CPUs in your system, but
          keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but