Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ad903fc..7eef15f 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -167,7 +167,7 @@ config VIRTUAL_MEM_MAP
 
 config DISCONTIGMEM
        bool "Discontiguous memory support"
-       depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC) && NUMA && VIRTUAL_MEM_MAP
+       depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
        help
          Say Y to support efficient handling of discontiguous physical memory,
@@ -176,10 +176,10 @@ config DISCONTIGMEM
          See <file:Documentation/vm/numa> for more.
 
 config IA64_CYCLONE
-       bool "Support Cyclone(EXA) Time Source"
+       bool "Cyclone (EXA) Time Source support"
        help
-               Say Y here to enable support for IBM EXA Cyclone time source.
-               If you're unsure, answer N.
+         Say Y here to enable support for IBM EXA Cyclone time source.
+         If you're unsure, answer N.
 
 config IOSAPIC
        bool