diff options
author | Paul Mackerras <paulus@samba.org> | 2006-12-04 05:59:07 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 05:59:07 +0100 |
commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/powerpc/Kconfig | |
parent | [PATCH] ppc: Fix io.h for config with CONFIG_PCI not set (diff) | |
parent | [XFRM]: Fix aevent structuring to be more complete. (diff) | |
download | linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.tar.xz linux-79acbb3ff2d8095b692e1502b9eb2ccec348de26.zip |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a41d191bf1be..96316c866107 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -433,7 +433,7 @@ config PPC_MAPLE default n help This option enables support for the Maple 970FX Evaluation Board. - For more informations, refer to <http://www.970eval.com> + For more information, refer to <http://www.970eval.com> config PPC_PASEMI depends on PPC_MULTIPLATFORM && PPC64 @@ -742,7 +742,7 @@ config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_DEFAULT def_bool y - depends on SMP && PPC_PSERIES + depends on (SMP && PPC_PSERIES) || PPC_CELL config ARCH_POPULATES_NODE_MAP def_bool y @@ -753,6 +753,15 @@ config ARCH_MEMORY_PROBE def_bool y depends on MEMORY_HOTPLUG +# Some NUMA nodes have memory ranges that span +# other nodes. Even though a pfn is valid and +# between a node's start and end pfns, it may not +# reside on that node. See memmap_init_zone() +# for details. +config NODES_SPAN_OTHER_NODES + def_bool y + depends on NEED_MULTIPLE_NODES + config PPC_64K_PAGES bool "64k page size" depends on PPC64 |