Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index be9e10b94ef8b0858f0a67228c1acdf94a8c3e3e..bd00f89eed1ed3c4dcaa7a5cb39cd6ef1a132505 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -34,6 +34,10 @@ config MMU
        bool
        default y
 
+config QUICKLIST
+       bool
+       default y
+
 config STACKTRACE_SUPPORT
        bool
        default y
@@ -143,10 +147,10 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-64)"
-       range 2 64
+       int "Maximum number of CPUs (2-1024)"
+       range 2 1024
        depends on SMP
-       default "32"
+       default "64"
 
 source "drivers/cpufreq/Kconfig"
 
@@ -222,9 +226,6 @@ config ARCH_SPARSEMEM_DEFAULT
        def_bool y
        select SPARSEMEM_STATIC
 
-config LARGE_ALLOCS
-       def_bool y
-
 source "mm/Kconfig"
 
 config ISA